git: 5871d72bcdb1 - main - devel/py-jaraco.context2: Remove obsoleted port

Po-Chuan Hsieh sunpoet at FreeBSD.org
Thu Jun 10 15:46:16 UTC 2021


The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5871d72bcdb1f85aeeb9399a2fe681909ceb70a7

commit 5871d72bcdb1f85aeeb9399a2fe681909ceb70a7
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-06-10 15:42:12 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-06-10 15:42:12 +0000

    devel/py-jaraco.context2: Remove obsoleted port
    
    Use devel/py-jaraco.context instead.
---
 MOVED                                              |   1 +
 devel/Makefile                                     |   1 -
 devel/py-jaraco.context2/Makefile                  |  40 --------
 devel/py-jaraco.context2/distinfo                  |   3 -
 .../files/patch-jaraco-context.py                  | 110 ---------------------
 devel/py-jaraco.context2/pkg-descr                 |   3 -
 6 files changed, 1 insertion(+), 157 deletions(-)

diff --git a/MOVED b/MOVED
index ad21c79548b6..c407f4a88390 100644
--- a/MOVED
+++ b/MOVED
@@ -16348,3 +16348,4 @@ devel/py-cliff2|devel/py-cliff|2021-06-10|Remove obsoleted port. Use devel/py-cl
 devel/py-cmd208|devel/py-cmd2|2021-06-10|Remove obsoleted port. Use devel/py-cmd2 instead
 devel/py-futurist1|devel/py-futurist|2021-06-10|Remove obsoleted port. Use devel/py-futurist instead
 devel/py-google-crc32c0|devel/py-google-crc32c|2021-06-10|Remove obsoleted port. Use devel/py-google-crc32c instead
+devel/py-jaraco.context2|devel/py-jaraco.context|2021-06-10|Remove obsoleted port. Use devel/py-jaraco.context instead
diff --git a/devel/Makefile b/devel/Makefile
index 1c461922942a..39df3ba8284b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4561,7 +4561,6 @@
     SUBDIR += py-jaraco
     SUBDIR += py-jaraco.classes
     SUBDIR += py-jaraco.context
-    SUBDIR += py-jaraco.context2
     SUBDIR += py-jaraco.functools
     SUBDIR += py-jaraco.itertools
     SUBDIR += py-jaraco.logging
diff --git a/devel/py-jaraco.context2/Makefile b/devel/py-jaraco.context2/Makefile
deleted file mode 100644
index cab7dce31599..000000000000
--- a/devel/py-jaraco.context2/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet at FreeBSD.org>
-
-PORTNAME=	jaraco.context
-PORTVERSION=	2.0
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	2
-
-MAINTAINER=	sunpoet at FreeBSD.org
-COMMENT=	Context managers by jaraco
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
-
-POST_PLIST=	trim-jaraco-namespace
-
-# jaraco.context 3.0.0+ requires Python 3.6+
-PORTSCOUT=	limit:^2\.
-
-post-patch:
-	@${REINPLACE_CMD} -e '/jaraco.apt/d; /yg.lockfile/d' ${WRKSRC}/setup.cfg
-
-post-install:
-	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py*
-	-@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.*
-	-@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__
-
-trim-jaraco-namespace:
-	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/devel/py-jaraco.context2/distinfo b/devel/py-jaraco.context2/distinfo
deleted file mode 100644
index 08e6e8f88b47..000000000000
--- a/devel/py-jaraco.context2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1546769646
-SHA256 (jaraco.context-2.0.tar.gz) = dc71afa2f0d6829234272a26aade99856db8b26d01ee6edb2b5027570c12b0d1
-SIZE (jaraco.context-2.0.tar.gz) = 11231
diff --git a/devel/py-jaraco.context2/files/patch-jaraco-context.py b/devel/py-jaraco.context2/files/patch-jaraco-context.py
deleted file mode 100644
index 61fc801eebb3..000000000000
--- a/devel/py-jaraco.context2/files/patch-jaraco-context.py
+++ /dev/null
@@ -1,110 +0,0 @@
---- jaraco/context.py.orig	2019-01-01 15:43:21 UTC
-+++ jaraco/context.py
-@@ -13,9 +13,6 @@ try:
- except Exception:
- 	import contextlib as contextlib2
- 
--import jaraco.apt
--import yg.lockfile
--
- 
- __metaclass__ = type
- 
-@@ -58,46 +55,6 @@ def data_lines_from_file(filename):
- 	return filter(None, strip_comments(file_lines_if_exists(filename)))
- 
- 
--def run():
--	"""
--	Run a command in the context of the system dependencies.
--	"""
--	parser = argparse.ArgumentParser()
--	parser.add_argument(
--		'--deps-def',
--		default=data_lines_from_file("system deps.txt")
--		+ data_lines_from_file("build deps.txt"),
--		help="A file specifying the dependencies (one per line)",
--		type=data_lines_from_file, dest="spec_deps")
--	parser.add_argument(
--		'--dep', action="append", default=[],
--		help="A specific dependency (multiple allowed)", dest="deps")
--	parser.add_argument(
--		'command', type=shlex.split,
--		default=shlex.split("python2.7 setup.py test"),
--		help="Command to invoke in the context of the dependencies")
--	parser.add_argument(
--		'--do-not-remove', default=False, action="store_true",
--		help="Keep any installed packages")
--	parser.add_argument(
--		'--aggressively-remove', default=False,
--		action="store_true",
--		help="When removing packages, also remove those automatically installed"
--		" as dependencies")
--	parser.add_argument(
--		'-l', '--log-level', default=logging.INFO,
--		type=log_level, help="Set log level (DEBUG, INFO, WARNING, ERROR)")
--	args = parser.parse_args()
--	logging.basicConfig(level=args.log_level)
--	context = dependency_context(
--		args.spec_deps + args.deps,
--		aggressively_remove=args.aggressively_remove)
--	with context as to_remove:
--		if args.do_not_remove:
--			del to_remove[:]
--		raise SystemExit(subprocess.Popen(args.command).wait())
--
--
- def log_level(level_string):
- 	"""
- 	Return a log level for a string
-@@ -106,50 +63,6 @@ def log_level(level_string):
- 
- 
- @contextlib.contextmanager
--def dependency_context(package_names, aggressively_remove=False):
--	"""
--	Install the supplied packages and yield. Finally, remove all packages
--	that were installed.
--	Currently assumes 'aptitude' is available.
--	"""
--	installed_packages = []
--	log = logging.getLogger(__name__)
--	try:
--		if not package_names:
--			logging.debug('No packages requested')
--		if package_names:
--			lock = yg.lockfile.FileLock(
--				'/tmp/.pkg-context-lock',
--				timeout=30 * 60)
--			log.info('Acquiring lock to perform install')
--			lock.acquire()
--			log.info('Installing ' + ', '.join(package_names))
--			output = subprocess.check_output(
--				['sudo', 'aptitude', 'install', '-y'] + package_names,
--				stderr=subprocess.STDOUT,
--			)
--			log.debug('Aptitude output:\n%s', output)
--			installed_packages = jaraco.apt.parse_new_packages(
--				output,
--				include_automatic=aggressively_remove)
--			if not installed_packages:
--				lock.release()
--			log.info('Installed ' + ', '.join(installed_packages))
--		yield installed_packages
--	except subprocess.CalledProcessError:
--		log.error("Error occurred installing packages")
--		raise
--	finally:
--		if installed_packages:
--			log.info('Removing ' + ','.join(installed_packages))
--			subprocess.check_call(
--				['sudo', 'aptitude', 'remove', '-y'] + installed_packages,
--				stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
--			)
--			lock.release()
--
--
-- at contextlib.contextmanager
- def pushd(dir):
- 	orig = os.getcwd()
- 	os.chdir(dir)
diff --git a/devel/py-jaraco.context2/pkg-descr b/devel/py-jaraco.context2/pkg-descr
deleted file mode 100644
index 3bbcaaf77499..000000000000
--- a/devel/py-jaraco.context2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-jaraco.context provides context managers.
-
-WWW: https://github.com/jaraco/jaraco.context


More information about the dev-commits-ports-main mailing list