diff options
-rw-r--r-- | lang/python/versioned_dependencies.mk | 5 | ||||
-rw-r--r-- | sysutils/Makefile | 3 | ||||
-rw-r--r-- | sysutils/py-eliot17/ALTERNATIVES | 1 | ||||
-rw-r--r-- | sysutils/py-eliot17/DESCR | 4 | ||||
-rw-r--r-- | sysutils/py-eliot17/Makefile | 33 | ||||
-rw-r--r-- | sysutils/py-eliot17/PLIST | 158 | ||||
-rw-r--r-- | sysutils/py-eliot17/distinfo | 6 | ||||
-rw-r--r-- | sysutils/py-eliot17/patches/patch-setup.py | 20 |
8 files changed, 3 insertions, 227 deletions
diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk index 51e82c0be12..af8353a2b41 100644 --- a/lang/python/versioned_dependencies.mk +++ b/lang/python/versioned_dependencies.mk @@ -1,4 +1,4 @@ -# $NetBSD: versioned_dependencies.mk,v 1.56 2021/11/27 16:41:45 adam Exp $ +# $NetBSD: versioned_dependencies.mk,v 1.57 2021/12/31 13:25:18 adam Exp $ # # This file determines which separate distribution of a Python # package is used as dependency, depending on the Python version @@ -9,7 +9,7 @@ # PYTHON_VERSIONED_DEPENDENCIES # The Python package which should be added as a dependency. # -# Possible values: Pmw Pillow X cairo eliot html2text hypothesis ipython jsonlib markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools sphinx test zipp +# Possible values: Pmw Pillow X cairo html2text hypothesis ipython jsonlib markdown more-itertools pip packaging pygments pyparsing python-digest rsa setuptools sphinx test zipp # Default: (nothing) # @@ -21,7 +21,6 @@ _SUPPORTED_PACKAGES+= Pmw x11/py-Pmw x11/py-Pmw2 _SUPPORTED_PACKAGES+= Pillow graphics/py-Pillow6 graphics/py-Pillow _SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X _SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo -_SUPPORTED_PACKAGES+= eliot sysutils/py-eliot17 sysutils/py-eliot # XXX feedparser 6.x is not only py27-incompatible, but also 5.x-API-incompatible #_SUPPORTED_PACKAGES+= feedparser textproc/py-feedparser5 textproc/py-feedparser _SUPPORTED_PACKAGES+= html2text textproc/py-html2text-2019.8.11 textproc/py-html2text diff --git a/sysutils/Makefile b/sysutils/Makefile index 8145f64280d..1f63bce8958 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.977 2021/12/18 15:07:01 prlw1 Exp $ +# $NetBSD: Makefile,v 1.978 2021/12/31 13:25:18 adam Exp $ # COMMENT= System utilities @@ -542,7 +542,6 @@ SUBDIR+= py-crontab SUBDIR+= py-dbus SUBDIR+= py-diffoscope SUBDIR+= py-eliot -SUBDIR+= py-eliot17 SUBDIR+= py-euca2ools SUBDIR+= py-filetype SUBDIR+= py-google-compute-engine diff --git a/sysutils/py-eliot17/ALTERNATIVES b/sysutils/py-eliot17/ALTERNATIVES deleted file mode 100644 index 27a39758539..00000000000 --- a/sysutils/py-eliot17/ALTERNATIVES +++ /dev/null @@ -1 +0,0 @@ -bin/eliot-prettyprint @PREFIX@/bin/eliot-prettyprint-@PYVERSSUFFIX@ diff --git a/sysutils/py-eliot17/DESCR b/sysutils/py-eliot17/DESCR deleted file mode 100644 index 0d5f2ac14fc..00000000000 --- a/sysutils/py-eliot17/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -eliot is a Python logging system that outputs causal chains of actions: actions -can spawn other actions, and eventually they either succeed or fail. The -resulting logs tell you the story of what your software did: what happened, and -what caused it. diff --git a/sysutils/py-eliot17/Makefile b/sysutils/py-eliot17/Makefile deleted file mode 100644 index d28ba56c649..00000000000 --- a/sysutils/py-eliot17/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2020/10/06 10:51:22 wiz Exp $ - -DISTNAME= eliot-1.7.0 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= sysutils python -MASTER_SITES= ${MASTER_SITE_PYPI:=e/eliot/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/itamarst/eliot -COMMENT= Logging library that tells you why it happened -LICENSE= apache-2.0 - -DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface -DEPENDS+= ${PYPKGPREFIX}-boltons>=19.0.1:../../devel/py-boltons -DEPENDS+= ${PYPKGPREFIX}-pyrsistent>=0.11.8:../../devel/py-pyrsistent -DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six -TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools - -PYTHON_VERSIONED_DEPENDENCIES= test:test -PYTHON_VERSIONED_DEPENDENCIES+= hypothesis:test - -USE_LANGUAGES= # none - -post-install: - cd ${DESTDIR}${PREFIX}/bin && \ - ${MV} eliot-prettyprint eliot-prettyprint-${PYVERSSUFFIX} || ${TRUE} - -do-test: - cd ${WRKSRC} && pytest-${PYVERSSUFFIX} eliot/tests - -.include "../../lang/python/egg.mk" -.include "../../lang/python/versioned_dependencies.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/py-eliot17/PLIST b/sysutils/py-eliot17/PLIST deleted file mode 100644 index 429bc00aaa6..00000000000 --- a/sysutils/py-eliot17/PLIST +++ /dev/null @@ -1,158 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2020/07/01 08:52:38 adam Exp $ -bin/eliot-prettyprint-${PYVERSSUFFIX} -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/entry_points.txt -${PYSITELIB}/${EGG_INFODIR}/requires.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt -${PYSITELIB}/eliot/__init__.py -${PYSITELIB}/eliot/__init__.pyc -${PYSITELIB}/eliot/__init__.pyo -${PYSITELIB}/eliot/_action.py -${PYSITELIB}/eliot/_action.pyc -${PYSITELIB}/eliot/_action.pyo -${PYSITELIB}/eliot/_asyncio.py -${PYSITELIB}/eliot/_asyncio.pyc -${PYSITELIB}/eliot/_asyncio.pyo -${PYSITELIB}/eliot/_bytesjson.py -${PYSITELIB}/eliot/_bytesjson.pyc -${PYSITELIB}/eliot/_bytesjson.pyo -${PYSITELIB}/eliot/_errors.py -${PYSITELIB}/eliot/_errors.pyc -${PYSITELIB}/eliot/_errors.pyo -${PYSITELIB}/eliot/_generators.py -${PYSITELIB}/eliot/_generators.pyc -${PYSITELIB}/eliot/_generators.pyo -${PYSITELIB}/eliot/_message.py -${PYSITELIB}/eliot/_message.pyc -${PYSITELIB}/eliot/_message.pyo -${PYSITELIB}/eliot/_output.py -${PYSITELIB}/eliot/_output.pyc -${PYSITELIB}/eliot/_output.pyo -${PYSITELIB}/eliot/_traceback.py -${PYSITELIB}/eliot/_traceback.pyc -${PYSITELIB}/eliot/_traceback.pyo -${PYSITELIB}/eliot/_util.py -${PYSITELIB}/eliot/_util.pyc -${PYSITELIB}/eliot/_util.pyo -${PYSITELIB}/eliot/_validation.py -${PYSITELIB}/eliot/_validation.pyc -${PYSITELIB}/eliot/_validation.pyo -${PYSITELIB}/eliot/_version.py -${PYSITELIB}/eliot/_version.pyc -${PYSITELIB}/eliot/_version.pyo -${PYSITELIB}/eliot/dask.py -${PYSITELIB}/eliot/dask.pyc -${PYSITELIB}/eliot/dask.pyo -${PYSITELIB}/eliot/filter.py -${PYSITELIB}/eliot/filter.pyc -${PYSITELIB}/eliot/filter.pyo -${PYSITELIB}/eliot/journald.py -${PYSITELIB}/eliot/journald.pyc -${PYSITELIB}/eliot/journald.pyo -${PYSITELIB}/eliot/json.py -${PYSITELIB}/eliot/json.pyc -${PYSITELIB}/eliot/json.pyo -${PYSITELIB}/eliot/logwriter.py -${PYSITELIB}/eliot/logwriter.pyc -${PYSITELIB}/eliot/logwriter.pyo -${PYSITELIB}/eliot/parse.py -${PYSITELIB}/eliot/parse.pyc -${PYSITELIB}/eliot/parse.pyo -${PYSITELIB}/eliot/prettyprint.py -${PYSITELIB}/eliot/prettyprint.pyc -${PYSITELIB}/eliot/prettyprint.pyo -${PYSITELIB}/eliot/serializers.py -${PYSITELIB}/eliot/serializers.pyc -${PYSITELIB}/eliot/serializers.pyo -${PYSITELIB}/eliot/stdlib.py -${PYSITELIB}/eliot/stdlib.pyc -${PYSITELIB}/eliot/stdlib.pyo -${PYSITELIB}/eliot/tai64n.py -${PYSITELIB}/eliot/tai64n.pyc -${PYSITELIB}/eliot/tai64n.pyo -${PYSITELIB}/eliot/testing.py -${PYSITELIB}/eliot/testing.pyc -${PYSITELIB}/eliot/testing.pyo -${PYSITELIB}/eliot/tests/__init__.py -${PYSITELIB}/eliot/tests/__init__.pyc -${PYSITELIB}/eliot/tests/__init__.pyo -${PYSITELIB}/eliot/tests/common.py -${PYSITELIB}/eliot/tests/common.pyc -${PYSITELIB}/eliot/tests/common.pyo -${PYSITELIB}/eliot/tests/corotests.py -${PLIST.py3x}${PYSITELIB}/eliot/tests/corotests.pyc -${PLIST.py3x}${PYSITELIB}/eliot/tests/corotests.pyo -${PYSITELIB}/eliot/tests/strategies.py -${PYSITELIB}/eliot/tests/strategies.pyc -${PYSITELIB}/eliot/tests/strategies.pyo -${PYSITELIB}/eliot/tests/test_action.py -${PYSITELIB}/eliot/tests/test_action.pyc -${PYSITELIB}/eliot/tests/test_action.pyo -${PYSITELIB}/eliot/tests/test_api.py -${PYSITELIB}/eliot/tests/test_api.pyc -${PYSITELIB}/eliot/tests/test_api.pyo -${PYSITELIB}/eliot/tests/test_coroutines.py -${PYSITELIB}/eliot/tests/test_coroutines.pyc -${PYSITELIB}/eliot/tests/test_coroutines.pyo -${PYSITELIB}/eliot/tests/test_dask.py -${PYSITELIB}/eliot/tests/test_dask.pyc -${PYSITELIB}/eliot/tests/test_dask.pyo -${PYSITELIB}/eliot/tests/test_filter.py -${PYSITELIB}/eliot/tests/test_filter.pyc -${PYSITELIB}/eliot/tests/test_filter.pyo -${PYSITELIB}/eliot/tests/test_generators.py -${PYSITELIB}/eliot/tests/test_generators.pyc -${PYSITELIB}/eliot/tests/test_generators.pyo -${PYSITELIB}/eliot/tests/test_journald.py -${PYSITELIB}/eliot/tests/test_journald.pyc -${PYSITELIB}/eliot/tests/test_journald.pyo -${PYSITELIB}/eliot/tests/test_json.py -${PYSITELIB}/eliot/tests/test_json.pyc -${PYSITELIB}/eliot/tests/test_json.pyo -${PYSITELIB}/eliot/tests/test_logwriter.py -${PYSITELIB}/eliot/tests/test_logwriter.pyc -${PYSITELIB}/eliot/tests/test_logwriter.pyo -${PYSITELIB}/eliot/tests/test_message.py -${PYSITELIB}/eliot/tests/test_message.pyc -${PYSITELIB}/eliot/tests/test_message.pyo -${PYSITELIB}/eliot/tests/test_output.py -${PYSITELIB}/eliot/tests/test_output.pyc -${PYSITELIB}/eliot/tests/test_output.pyo -${PYSITELIB}/eliot/tests/test_parse.py -${PYSITELIB}/eliot/tests/test_parse.pyc -${PYSITELIB}/eliot/tests/test_parse.pyo -${PYSITELIB}/eliot/tests/test_prettyprint.py -${PYSITELIB}/eliot/tests/test_prettyprint.pyc -${PYSITELIB}/eliot/tests/test_prettyprint.pyo -${PYSITELIB}/eliot/tests/test_pyinstaller.py -${PYSITELIB}/eliot/tests/test_pyinstaller.pyc -${PYSITELIB}/eliot/tests/test_pyinstaller.pyo -${PYSITELIB}/eliot/tests/test_serializers.py -${PYSITELIB}/eliot/tests/test_serializers.pyc -${PYSITELIB}/eliot/tests/test_serializers.pyo -${PYSITELIB}/eliot/tests/test_stdlib.py -${PYSITELIB}/eliot/tests/test_stdlib.pyc -${PYSITELIB}/eliot/tests/test_stdlib.pyo -${PYSITELIB}/eliot/tests/test_tai64n.py -${PYSITELIB}/eliot/tests/test_tai64n.pyc -${PYSITELIB}/eliot/tests/test_tai64n.pyo -${PYSITELIB}/eliot/tests/test_testing.py -${PYSITELIB}/eliot/tests/test_testing.pyc -${PYSITELIB}/eliot/tests/test_testing.pyo -${PYSITELIB}/eliot/tests/test_traceback.py -${PYSITELIB}/eliot/tests/test_traceback.pyc -${PYSITELIB}/eliot/tests/test_traceback.pyo -${PYSITELIB}/eliot/tests/test_twisted.py -${PYSITELIB}/eliot/tests/test_twisted.pyc -${PYSITELIB}/eliot/tests/test_twisted.pyo -${PYSITELIB}/eliot/tests/test_util.py -${PYSITELIB}/eliot/tests/test_util.pyc -${PYSITELIB}/eliot/tests/test_util.pyo -${PYSITELIB}/eliot/tests/test_validation.py -${PYSITELIB}/eliot/tests/test_validation.pyc -${PYSITELIB}/eliot/tests/test_validation.pyo -${PYSITELIB}/eliot/twisted.py -${PYSITELIB}/eliot/twisted.pyc -${PYSITELIB}/eliot/twisted.pyo diff --git a/sysutils/py-eliot17/distinfo b/sysutils/py-eliot17/distinfo deleted file mode 100644 index 442401b9788..00000000000 --- a/sysutils/py-eliot17/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:20:03 nia Exp $ - -BLAKE2s (eliot-1.7.0.tar.gz) = 596b1ad8e381b44ec7d685049979079ee6e10132cb0b4ece7baf92a8826dd601 -SHA512 (eliot-1.7.0.tar.gz) = da86e0c26e0bec13951d037902cdb761c96fdb043528b51e2801f07b9cc304265b20d841cecf82a206e15abacbe4d75e315003333a461a8bebb6c32a55bde07d -Size (eliot-1.7.0.tar.gz) = 152507 bytes -SHA1 (patch-setup.py) = ea0fbacf10edf09aeb6a518a37dfb807a541486f diff --git a/sysutils/py-eliot17/patches/patch-setup.py b/sysutils/py-eliot17/patches/patch-setup.py deleted file mode 100644 index 453a48319ab..00000000000 --- a/sysutils/py-eliot17/patches/patch-setup.py +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-setup.py,v 1.1 2020/08/27 12:32:49 joerg Exp $ - ---- setup.py.orig 2020-08-26 11:50:47.089756210 +0000 -+++ setup.py -@@ -1,13 +1,14 @@ - from setuptools import setup - - import versioneer -+import sys - - - def read(path): - """ - Read the contents of a file. - """ -- with open(path) as f: -+ with open(path, **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f: - return f.read() - - |