From 7e72619de54abb9563df33b796e474dbd86c5a9d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 15 Nov 2021 14:37:03 -0500 Subject: [PATCH 1/3] python-incremental: update to 21.3.0. --- srcpkgs/python-incremental/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template index 693613085c17..900b83f5f774 100644 --- a/srcpkgs/python-incremental/template +++ b/srcpkgs/python-incremental/template @@ -1,18 +1,18 @@ # Template file for 'python-incremental' pkgname=python-incremental -version=17.5.0 -revision=6 +version=21.3.0 +revision=1 wrksrc="incremental-${version}" build_style=python-module -pycompile_module="incremental" hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Small library that versions your Python projects (Python2)" maintainer="Alessio Sergi " -homepage="https://github.com/twisted/incremental" license="MIT" +homepage="https://github.com/twisted/incremental" +changelog="https://raw.githubusercontent.com/twisted/incremental/trunk/NEWS.rst" distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz" -checksum=7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3 +checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 post_install() { vlicense LICENSE @@ -20,7 +20,6 @@ post_install() { python3-incremental_package() { depends="python3" - pycompile_module="incremental" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* From 75110002a5e8b0aae6c4f0f7b33d3dd1e9fef977 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 15 Nov 2021 11:15:03 -0500 Subject: [PATCH 2/3] python-Twisted: remove python3 subpackage --- .../python-Twisted/python3-Twisted.INSTALL | 5 --- srcpkgs/python-Twisted/python3-Twisted.REMOVE | 5 --- srcpkgs/python-Twisted/template | 32 +++---------------- srcpkgs/python3-Twisted | 1 - 4 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/python-Twisted/python3-Twisted.INSTALL delete mode 100644 srcpkgs/python-Twisted/python3-Twisted.REMOVE delete mode 120000 srcpkgs/python3-Twisted diff --git a/srcpkgs/python-Twisted/python3-Twisted.INSTALL b/srcpkgs/python-Twisted/python3-Twisted.INSTALL deleted file mode 100644 index 632dfe8fa02c..000000000000 --- a/srcpkgs/python-Twisted/python3-Twisted.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case ${ACTION} in -post) - python3 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 - ;; -esac diff --git a/srcpkgs/python-Twisted/python3-Twisted.REMOVE b/srcpkgs/python-Twisted/python3-Twisted.REMOVE deleted file mode 100644 index ec8608bc5f8e..000000000000 --- a/srcpkgs/python-Twisted/python3-Twisted.REMOVE +++ /dev/null @@ -1,5 +0,0 @@ -case ${ACTION} in -purge) - find usr/lib/python3.*/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f - ;; -esac diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template index 93560162f8fc..9acec8665c96 100644 --- a/srcpkgs/python-Twisted/template +++ b/srcpkgs/python-Twisted/template @@ -1,12 +1,11 @@ # Template file for 'python-Twisted' pkgname=python-Twisted version=20.3.0 -revision=3 +revision=4 wrksrc="Twisted-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools - python-incremental python3-incremental" -makedepends="python-devel python3-devel" +build_style=python2-module +hostmakedepends="python-setuptools python-incremental" +makedepends="python-devel" depends="python-setuptools python-zope.interface python-openssl python-service_identity python-constantly python-incremental python-automat python-hyperlink python-PyHamcrest" @@ -14,6 +13,7 @@ short_desc="Asynchronous networking framework written in Python (Python2)" maintainer="Alessio Sergi " license="MIT" homepage="https://twistedmatrix.com/" +changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst" distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.bz2" checksum=d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 @@ -31,25 +31,3 @@ alternatives=" post_install() { vlicense LICENSE } - -python3-Twisted_package() { - alternatives=" - twisted:cftp:/usr/bin/cftp3 - twisted:ckeygen:/usr/bin/ckeygen3 - twisted:conch:/usr/bin/conch3 - twisted:mailmail:/usr/bin/mailmail3 - twisted:pyhtmlizer:/usr/bin/pyhtmlizer3 - twisted:tkconch:/usr/bin/tkconch3 - twisted:trial:/usr/bin/trial3 - twisted:twist:/usr/bin/twist3 - twisted:twistd:/usr/bin/twistd3" - depends="python3-setuptools python3-zope.interface python3-openssl - python3-service_identity python3-constantly python3-incremental - python3-automat python3-hyperlink python3-PyHamcrest" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3* - vlicense LICENSE - } -} diff --git a/srcpkgs/python3-Twisted b/srcpkgs/python3-Twisted deleted file mode 120000 index e4bef5378519..000000000000 --- a/srcpkgs/python3-Twisted +++ /dev/null @@ -1 +0,0 @@ -python-Twisted \ No newline at end of file From ef076c736ebf889ff092d8b8d1f6653b15741207 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 15 Nov 2021 11:20:43 -0500 Subject: [PATCH 3/3] python3-Twisted: update to 21.7.0. --- srcpkgs/python3-Twisted/INSTALL | 5 ++++ srcpkgs/python3-Twisted/REMOVE | 5 ++++ srcpkgs/python3-Twisted/template | 44 ++++++++++++++++++++++++++++++++ srcpkgs/python3-Twisted/update | 1 + 4 files changed, 55 insertions(+) create mode 100644 srcpkgs/python3-Twisted/INSTALL create mode 100644 srcpkgs/python3-Twisted/REMOVE create mode 100644 srcpkgs/python3-Twisted/template create mode 100644 srcpkgs/python3-Twisted/update diff --git a/srcpkgs/python3-Twisted/INSTALL b/srcpkgs/python3-Twisted/INSTALL new file mode 100644 index 000000000000..632dfe8fa02c --- /dev/null +++ b/srcpkgs/python3-Twisted/INSTALL @@ -0,0 +1,5 @@ +case ${ACTION} in +post) + python3 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 + ;; +esac diff --git a/srcpkgs/python3-Twisted/REMOVE b/srcpkgs/python3-Twisted/REMOVE new file mode 100644 index 000000000000..ec8608bc5f8e --- /dev/null +++ b/srcpkgs/python3-Twisted/REMOVE @@ -0,0 +1,5 @@ +case ${ACTION} in +purge) + find usr/lib/python3.*/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f + ;; +esac diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template new file mode 100644 index 000000000000..f9e92b93eae9 --- /dev/null +++ b/srcpkgs/python3-Twisted/template @@ -0,0 +1,44 @@ +# Template file for 'python3-Twisted' +pkgname=python3-Twisted +version=21.7.0 +revision=1 +wrksrc="Twisted-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-incremental" +makedepends="python3-devel" +depends="python3-zope.interface python3-constantly python3-incremental + python3-automat python3-hyperlink python3-attrs python3-typing_extensions + python3-openssl python3-service_identity python3-pyasn1" +checkdepends="python3-PyHamcrest $depends" +short_desc="Asynchronous networking framework written in Python (Python3)" +maintainer="Alessio Sergi " +license="MIT" +homepage="https://twistedmatrix.com/" +changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst" +distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz" +checksum=2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006 + +alternatives=" + twisted:cftp:/usr/bin/cftp3 + twisted:ckeygen:/usr/bin/ckeygen3 + twisted:conch:/usr/bin/conch3 + twisted:mailmail:/usr/bin/mailmail3 + twisted:pyhtmlizer:/usr/bin/pyhtmlizer3 + twisted:tkconch:/usr/bin/tkconch3 + twisted:trial:/usr/bin/trial3 + twisted:twist:/usr/bin/twist3 + twisted:twistd:/usr/bin/twistd3" + +post_patch() { + # test requires unpackaged cython-test-exception-raiser + rm src/twisted/test/test_failure.py +} + +post_install() { + # don't conflict with python-Twisted + for f in "${DESTDIR}"/usr/bin/*; do + mv "${f}"{,3} + done + + vlicense LICENSE +} diff --git a/srcpkgs/python3-Twisted/update b/srcpkgs/python3-Twisted/update new file mode 100644 index 000000000000..e299d00ea67c --- /dev/null +++ b/srcpkgs/python3-Twisted/update @@ -0,0 +1 @@ +ignore="*rc*"