From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
Date: Wed, 17 Aug 2022 07:37:08 +0200 [thread overview]
Message-ID: <20220817053708.3_m8xnKquuULyk24bmF2xW2XJSwHyg4vC70495JymAI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38731@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1810 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages buildbot
https://github.com/void-linux/void-packages/pull/38731
[NOMERGE] buildbot & deps: remove
## ! This should not be merged until the necessary infra changes happen !
Removes buildbot and all python2 dependencies in the dependency tree that became unused as a result.
- buildbot
- python-Jinja2
- python-MarkupSafe
- python-dateutil
- python-sqlalchemy-migrate
- python-tempita
- python-SQLAlchemy
- python-sqlparse
- python-decorator
- python-Twisted
- Twisted (transitional dummy package)
- python-openssl
- python-service_identity
- python-pyasn1-modules
- python-pyasn1
- python-cryptography
- python-ipaddress
- python-cffi
- python-pycparser
- python-ply
- python-constantly
- python-incremental
- python-automat
- python-hyperlink
- python-idna
- python-typing
- python-PyHamcrest
- buildbot-slave
**Note:** buildbot does have new versions available that use python3, but the current direction that the infra is heading towards uses buildbot from PyPI directly, so I'm not sure if it should be updated or removed.
Also, should most of the `python3-` packages that have changed in this PR be revbumped? I've locally verified that the package contents are the same except in a few cases.
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/38731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-buildbot-38731.patch --]
[-- Type: text/x-diff, Size: 79822 bytes --]
From 31724ea7b6c7dc28718db4339f72819fe78195a7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:12:26 -0400
Subject: [PATCH 01/29] buildbot: remove package.
now unused.
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 65 deletions(-)
delete mode 100644 srcpkgs/buildbot/patches/terse-irc.patch
delete mode 100644 srcpkgs/buildbot/template
delete mode 100644 srcpkgs/buildbot/update
diff --git a/srcpkgs/buildbot/patches/terse-irc.patch b/srcpkgs/buildbot/patches/terse-irc.patch
deleted file mode 100644
index fd6e12edd1a8..000000000000
--- a/srcpkgs/buildbot/patches/terse-irc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/buildbot/status/words.py
-+++ b/buildbot/status/words.py
-@@ -439,9 +439,9 @@
- self.send(r)
-
- results_descriptions = {
-- SUCCESS: ("Success", 'GREEN'),
-- WARNINGS: ("Warnings", 'YELLOW'),
-- FAILURE: ("Failure", 'RED'),
-+ SUCCESS: ("OK", 'GREEN'),
-+ WARNINGS: ("Warn", 'YELLOW'),
-+ FAILURE: ("Fail", 'RED'),
- EXCEPTION: ("Exception", 'PURPLE'),
- RETRY: ("Retry", 'AQUA_LIGHT'),
- }
-@@ -466,19 +466,18 @@
- results = self.getResultsDescriptionAndColor(build.getResults())
- if self.reportBuild(builder_name, buildnum):
- if self.useRevisions:
-- r = "build containing revision(s) [%s] on %s is complete: %s" % \
-+ r = "%s/%s: %s" % \
- (buildrevs, builder_name, results[0])
- else:
- r = "build #%d of %s is complete: %s" % \
- (buildnum, builder_name, results[0])
-
-- r += ' [%s]' % maybeColorize(" ".join(build.getText()), results[1], self.useColors)
- buildurl = self.bot.status.getURLForThing(build)
- if buildurl:
-- r += " Build details are at %s" % buildurl
-+ r += ": %s" % buildurl
-
- if self.bot.showBlameList and build.getResults() != SUCCESS and len(build.changes) != 0:
-- r += ' blamelist: ' + ', '.join(list(set([c.who for c in build.changes])))
-+ r += ' blame: ' + ', '.join(list(set([c.who for c in build.changes])))
-
- self.send(r)
-
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
deleted file mode 100644
index ae905fc67ab8..000000000000
--- a/srcpkgs/buildbot/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'buildbot'
-pkgname=buildbot
-reverts="2.4.1_1"
-version=0.8.14
-revision=5
-build_style=python2-module
-pycompile_dirs="usr/share/buildbot/contrib"
-hostmakedepends="python"
-depends="python-setuptools python-dateutil python-Jinja2 python-sqlalchemy-migrate python-Twisted"
-short_desc="System to automate the compile/test cycle"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://buildbot.net/"
-distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=331efd07bd7522c222a8fb258801e8d78332c88d778ee76416b9e1028676e964
-
-pre_install() {
- sed -i 's,#!/usr/bin/env jython,#!/usr/bin/python2,' contrib/run_maxq.py
-}
-post_install() {
- # Install all contrib modules.
- local contribdir=${DESTDIR}/usr/share/buildbot/contrib
-
- vmkdir usr/share/buildbot/contrib
- install -m755 ${wrksrc}/contrib/*.py ${contribdir}
-}
diff --git a/srcpkgs/buildbot/update b/srcpkgs/buildbot/update
deleted file mode 100644
index aa695cd1c57b..000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d1180ad4903..c149719704bc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -28,6 +28,7 @@ replaces="
avogadro<=1.2.0_8
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
From 2e895c1bebac2c015748076b81f8ff8af9d80060 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:13:06 -0400
Subject: [PATCH 02/29] buildbot-slave: remove package.
now unused.
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 srcpkgs/buildbot-slave/template
delete mode 120000 srcpkgs/buildbot-slave/update
diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
deleted file mode 100644
index 8b6c19bd9e3b..000000000000
--- a/srcpkgs/buildbot-slave/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'buildbot-slave'
-pkgname=buildbot-slave
-version=0.8.14
-revision=3
-build_style=python2-module
-hostmakedepends="python"
-depends="python-Twisted"
-short_desc="BuildBot Slave Daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://buildbot.net/"
-distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7db02738c02d34c4d32508ac200e5f089ba73549315b127a9d8c0808d1a6d7a9
diff --git a/srcpkgs/buildbot-slave/update b/srcpkgs/buildbot-slave/update
deleted file mode 120000
index 7b5c744083b9..000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c149719704bc..6643da46bf95 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,7 @@ replaces="
bokken<=1.8_3
bomi<=0.9.11_17
buildbot<=0.8.14_5
+ buildbot-slave<=0.8.14_3
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
From 0719efe8982de766680f76ec10a81f3c6f0ae720 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:04:26 -0400
Subject: [PATCH 03/29] python-Jinja2: remove package.
unused dependency, Python 2.
---
srcpkgs/python-Jinja2/template | 27 ---------------------------
srcpkgs/python-Jinja2/update | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-Jinja2/template
delete mode 100644 srcpkgs/python-Jinja2/update
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
deleted file mode 100644
index 3e8ab4268b5d..000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-wrksrc="Jinja2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
-short_desc="Full featured template engine (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://jinja.pocoo.org/"
-changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.rst
- # these files are valid only on Python 3.6+
- rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncsupport.py
- rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncfilters.py
-}
diff --git a/srcpkgs/python-Jinja2/update b/srcpkgs/python-Jinja2/update
deleted file mode 100644
index 3077367c0194..000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6643da46bf95..eb63ef8d9673 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -290,6 +290,7 @@ replaces="
pyside-tools<=0.2.15_2
pystopwatch<=2019_2
python-Babel<=2.8.0_4
+ python-Jinja2<=2.11.3_2
python-M2Crypto<=0.35.2_7
python-Pillow<=6.2.2_3
python-Pygments<=2.5.2_4
From bd4cf4d1ad26db700837fbff368656b30417a822 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:06:51 -0400
Subject: [PATCH 04/29] python-MarkupSafe: remove package.
unused dependency, python2
---
srcpkgs/python-MarkupSafe/template | 18 ------------------
srcpkgs/python-MarkupSafe/update | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 srcpkgs/python-MarkupSafe/template
delete mode 100644 srcpkgs/python-MarkupSafe/update
diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
deleted file mode 100644
index 95fb3208e832..000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-wrksrc="MarkupSafe-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://palletsprojects.com/p/markupsafe/"
-distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python-MarkupSafe/update b/srcpkgs/python-MarkupSafe/update
deleted file mode 100644
index 6e16f5da3819..000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index eb63ef8d9673..8807452cef9a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -292,6 +292,7 @@ replaces="
python-Babel<=2.8.0_4
python-Jinja2<=2.11.3_2
python-M2Crypto<=0.35.2_7
+ python-MarkupSafe<=1.1.1_7
python-Pillow<=6.2.2_3
python-Pygments<=2.5.2_4
python-PyQt4<=4.12.1_4
From bb8a4842ac1b5de886c00add44eb6c293d0da659 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:28:37 -0400
Subject: [PATCH 05/29] python-dateutil: remove package.
unused dependency, python 2
---
.../patches/setuptools_scm.patch | 28 -----------------
srcpkgs/python-dateutil/template | 30 -------------------
srcpkgs/python3-dateutil | 1 -
srcpkgs/python3-dateutil/template | 18 +++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 19 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-dateutil/template
delete mode 120000 srcpkgs/python3-dateutil
create mode 100644 srcpkgs/python3-dateutil/template
diff --git a/srcpkgs/python-dateutil/patches/setuptools_scm.patch b/srcpkgs/python-dateutil/patches/setuptools_scm.patch
deleted file mode 100644
index 9e5103ce4d46..000000000000
--- a/srcpkgs/python-dateutil/patches/setuptools_scm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Void doesn't package setuptools_scm for Python 2, so remove the dependency.
-Leave a placeholder for version number that can be substituted at build.
-
-diff -ur a/setup.cfg b/setup.cfg
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -35,7 +35,6 @@
-
- [options]
- zip_safe = True
--setup_requires = setuptools_scm
- install_requires = six >= 1.5
- python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*
- packages = find:
-diff -ur a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -47,9 +47,7 @@
-
-
- setup(
-- use_scm_version={
-- 'write_to': 'dateutil/_version.py',
-- },
-+ version=%PKGVERSION%,
- ## Needed since doctest not supported by PyPA.
- long_description = README,
- cmdclass={
diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
deleted file mode 100644
index 51c0a4521f6b..000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dateutil_package() {
- depends="python3-six tzdata"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dateutil b/srcpkgs/python3-dateutil
deleted file mode 120000
index 4ea05edb0982..000000000000
--- a/srcpkgs/python3-dateutil
+++ /dev/null
@@ -1 +0,0 @@
-python-dateutil
\ No newline at end of file
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..3bc806c55d40
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=2
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+short_desc="Extensions to the standard Python3 datetime module"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/dateutil/dateutil"
+distfiles="${PYPI_SITE}/p/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
+checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8807452cef9a..77c541a3f84f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,7 @@ replaces="
python-configobj<=5.0.6_9
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
From f00706c139356f208ed66dacaa753b1b992424c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:55:43 -0400
Subject: [PATCH 06/29] python{,3}-sqlalchemy-migrate: remove package.
unused dependency, python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 38 ----------------------
srcpkgs/python3-sqlalchemy-migrate | 1 -
srcpkgs/removed-packages/template | 2 ++
3 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
delete mode 120000 srcpkgs/python3-sqlalchemy-migrate
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 9f8db8ae448e..000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=5
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="migrate"
-hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/stackforge/sqlalchemy-migrate"
-distfiles="${PYPI_SITE}/s/sqlalchemy-migrate/sqlalchemy-migrate-${version}.tar.gz"
-checksum=8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae
-
-alternatives="
- migrate:migrate-repository:/usr/bin/migrate-repository2
- migrate:migrate:/usr/bin/migrate2"
-
-post_install() {
- vlicense COPYING LICENSE
-}
-
-python3-sqlalchemy-migrate_package() {
- alternatives="
- migrate:migrate-repository:/usr/bin/migrate-repository3
- migrate:migrate:/usr/bin/migrate3"
- depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six
- python3-sqlparse python3-tempita"
- pycompile_module="migrate"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense COPYING LICENSE
- }
-}
diff --git a/srcpkgs/python3-sqlalchemy-migrate b/srcpkgs/python3-sqlalchemy-migrate
deleted file mode 120000
index b984188f6331..000000000000
--- a/srcpkgs/python3-sqlalchemy-migrate
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlalchemy-migrate
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 77c541a3f84f..1bac7e58546c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,7 @@ replaces="
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -360,6 +361,7 @@ replaces="
python3-pyside-phonon<=5.15.0_2
python3-pyside<=5.15.0_2
python3-shiboken<=5.15.0_3
+ python3-sqlalchemy-migrate<=0.12.0_5
python3-txacme<=0.9.3_3
python3-zipp<=3.6.0_1
qimageblitz<=0.0.6_4
From 1bf4059beba0465f7634af1121c26967afbcaddb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:17:57 -0400
Subject: [PATCH 07/29] python{,3}-tempita: remove package.
unused dep, python 2, dead upstream
---
srcpkgs/python-tempita/template | 39 -------------------------------
srcpkgs/python-tempita/update | 1 -
srcpkgs/python3-tempita | 1 -
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
delete mode 120000 srcpkgs/python3-tempita
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index ab6b7710c5de..000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=7
-wrksrc="Tempita-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="${hostmakedepends}"
-depends="python"
-pycompile_module="tempita"
-short_desc="A small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://pythonpaste.org/tempita/"
-license="MIT"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
-
-post_patch() {
- # setuptools no longer supports use_2to3
- vsed -i setup.py -e '/use_2to3/d'
-}
-
-do_build() {
- # This is pure python, no need for cross antics
- python2.7 setup.py build --build-base=build-2.7
-
- # Convert py2 syntax to py3 since setuptools no longer does it
- 2to3-${py3_ver} -w tempita
- python3 setup.py build --build-base=build-${py3_ver}
-}
-
-python3-tempita_package() {
- depends="python3"
- pycompile_module="tempita"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a3..000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
diff --git a/srcpkgs/python3-tempita b/srcpkgs/python3-tempita
deleted file mode 120000
index 63636314d977..000000000000
--- a/srcpkgs/python3-tempita
+++ /dev/null
@@ -1 +0,0 @@
-python-tempita
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1bac7e58546c..7276517059aa 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -337,6 +337,7 @@ replaces="
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
+ python-tempita<=0.5.2_7
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
@@ -362,6 +363,7 @@ replaces="
python3-pyside<=5.15.0_2
python3-shiboken<=5.15.0_3
python3-sqlalchemy-migrate<=0.12.0_5
+ python3-tempita<=0.5.2_7
python3-txacme<=0.9.3_3
python3-zipp<=3.6.0_1
qimageblitz<=0.0.6_4
From 40d37eebeb90bacb7994266a9ddba17ae8949b2e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:30:32 -0400
Subject: [PATCH 08/29] python-SQLAlchemy: remove package.
unused dep, python2.
---
srcpkgs/python-SQLAlchemy/template | 29 -------------------
srcpkgs/python3-SQLAlchemy | 1 -
srcpkgs/python3-SQLAlchemy/template | 19 ++++++++++++
.../update | 0
srcpkgs/removed-packages/template | 1 +
5 files changed, 20 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 120000 srcpkgs/python3-SQLAlchemy
create mode 100644 srcpkgs/python3-SQLAlchemy/template
rename srcpkgs/{python-SQLAlchemy => python3-SQLAlchemy}/update (100%)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index 359aa5084f2b..000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=4
-wrksrc="SQLAlchemy-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
-short_desc="SQL Toolkit and Object Relational Mapper for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://www.sqlalchemy.org"
-distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-SQLAlchemy_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="python3"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-SQLAlchemy b/srcpkgs/python3-SQLAlchemy
deleted file mode 120000
index 7236787d1960..000000000000
--- a/srcpkgs/python3-SQLAlchemy
+++ /dev/null
@@ -1 +0,0 @@
-python-SQLAlchemy
\ No newline at end of file
diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
new file mode 100644
index 000000000000..db49bf375119
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=5
+wrksrc="SQLAlchemy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-mock python3-pytest"
+short_desc="SQL Toolkit and Object Relational Mapper for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.sqlalchemy.org"
+distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
+checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update
similarity index 100%
rename from srcpkgs/python-SQLAlchemy/update
rename to srcpkgs/python3-SQLAlchemy/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7276517059aa..80914b378789 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,7 @@ replaces="
python-Pygments<=2.5.2_4
python-PyQt4<=4.12.1_4
python-SecretStorage<=2.3.1_4
+ python-SQLAlchemy<=1.3.18_4
python-audit<=2.8.5_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
From c26c2960dca5a05f327837656a481d447778bfef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:42:57 -0400
Subject: [PATCH 09/29] python-sqlparse: remove package.
unused dep, python2
---
srcpkgs/python-sqlparse/template | 32 -------------------------------
srcpkgs/python3-sqlparse | 1 -
srcpkgs/python3-sqlparse/template | 20 +++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 45224c6c879f..000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=5
-wrksrc="sqlparse-${version}"
-build_style=python-module
-pycompile_module="sqlparse"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/andialbrecht/sqlparse"
-distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz"
-checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
-alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-sqlparse_package() {
- depends="python3-setuptools"
- pycompile_module="sqlparse"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3"
- pkg_install() {
- vmove usr/bin/sqlformat3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-sqlparse b/srcpkgs/python3-sqlparse
deleted file mode 120000
index c99cce656dc2..000000000000
--- a/srcpkgs/python3-sqlparse
+++ /dev/null
@@ -1 +0,0 @@
-python-sqlparse
\ No newline at end of file
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..100dfedd9e7d
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-sqlparse'
+pkgname=python3-sqlparse
+version=0.3.0
+revision=6
+wrksrc="sqlparse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Non-validating SQL parser for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/andialbrecht/sqlparse"
+distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz"
+checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
+
+post_install() {
+ vlicense LICENSE
+ # compat with old alternatives group
+ ln -s /usr/bin/sqlformat ${DESTDIR}/usr/bin/sqlformat3
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 80914b378789..2b2378f62076 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,7 @@ replaces="
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_5
python-tempita<=0.5.2_7
python-unicorn>=0
python-urllib3<=1.26.6_2
From ffd20c3fa7e016fb4aa9b6e307845bcf4215f8c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:46:19 -0400
Subject: [PATCH 10/29] python-decorator: remove package.
unused dep, python2
---
srcpkgs/python-decorator/template | 20 --------------------
srcpkgs/python-decorator/update | 2 --
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 srcpkgs/python-decorator/template
delete mode 100644 srcpkgs/python-decorator/update
diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template
deleted file mode 100644
index 913077f2a63f..000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-wrksrc="decorator-${version}"
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/micheles/decorator"
-changelog="https://raw.githubusercontent.com/micheles/decorator/master/CHANGES.md"
-distfiles="${PYPI_SITE}/d/decorator/decorator-${version}.tar.gz"
-checksum=e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python-decorator/update b/srcpkgs/python-decorator/update
deleted file mode 100644
index 8c1b46ba5d3a..000000000000
--- a/srcpkgs/python-decorator/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# decorator >= 5.0 does not support Python 2
-pattern="decorator-\K4\.[0-9.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b2378f62076..52500a2665ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,7 @@ replaces="
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-dateutil<=2.8.2_1
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
From d39bd7172aa988e6ef5717b68815c60210a50ef8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:11:31 -0400
Subject: [PATCH 11/29] Twisted: remove package.
dummy package for package that will be removed.
---
srcpkgs/Twisted/template | 10 ----------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 10 deletions(-)
delete mode 100644 srcpkgs/Twisted/template
diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template
deleted file mode 100644
index c172f7c26be7..000000000000
--- a/srcpkgs/Twisted/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'Twisted'
-pkgname=Twisted
-version=17.9.0
-revision=2
-build_style=meta
-depends="python-Twisted>=${version}_${revision}"
-short_desc="Event-driven networking engine written in Python (transitional dummy package)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://twistedmatrix.com/"
-license="MIT"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 52500a2665ab..3d69ecbaafd4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
MoinMoin<=1.9.11_1
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From c163c95ca14ae3e6d91e11777b1bb5cee1b8ac1e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:06 -0400
Subject: [PATCH 12/29] python-Twisted: remove package.
unused dep, python 2
---
srcpkgs/python-Twisted/INSTALL | 5 ----
srcpkgs/python-Twisted/REMOVE | 5 ----
srcpkgs/python-Twisted/template | 38 -------------------------------
srcpkgs/python-Twisted/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 49 deletions(-)
delete mode 100644 srcpkgs/python-Twisted/INSTALL
delete mode 100644 srcpkgs/python-Twisted/REMOVE
delete mode 100644 srcpkgs/python-Twisted/template
delete mode 100644 srcpkgs/python-Twisted/update
diff --git a/srcpkgs/python-Twisted/INSTALL b/srcpkgs/python-Twisted/INSTALL
deleted file mode 100644
index 2752e04bc993..000000000000
--- a/srcpkgs/python-Twisted/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-post)
- python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1
- ;;
-esac
diff --git a/srcpkgs/python-Twisted/REMOVE b/srcpkgs/python-Twisted/REMOVE
deleted file mode 100644
index 0ffe8186a943..000000000000
--- a/srcpkgs/python-Twisted/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-purge)
- find usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
- ;;
-esac
diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
deleted file mode 100644
index 173600b79f34..000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-wrksrc="Twisted-${version}"
-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"
-short_desc="Asynchronous networking framework written in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-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
-
-alternatives="
- twisted:cftp:/usr/bin/cftp2
- twisted:ckeygen:/usr/bin/ckeygen2
- twisted:conch:/usr/bin/conch2
- twisted:mailmail:/usr/bin/mailmail2
- twisted:pyhtmlizer:/usr/bin/pyhtmlizer2
- twisted:tkconch:/usr/bin/tkconch2
- twisted:trial:/usr/bin/trial2
- twisted:twist:/usr/bin/twist2
- twisted:twistd:/usr/bin/twistd2"
-
-post_install() {
- # don't conflict with python3-Twisted
- for f in "${DESTDIR}"/usr/bin/*; do
- mv "${f}"{,2}
- done
-
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-Twisted/update b/srcpkgs/python-Twisted/update
deleted file mode 100644
index e299d00ea67c..000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3d69ecbaafd4..7207e716f98d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -299,6 +299,7 @@ replaces="
python-PyQt4<=4.12.1_4
python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-Twisted<=20.3.0_4
python-audit<=2.8.5_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
From 0696af73b04a95839047ba7bee85654ff1e7202c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:25 -0400
Subject: [PATCH 13/29] python3-Twisted: remove alternatives group.
---
srcpkgs/python3-Twisted/template | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index 37c2c1fcf2cd..624abf591a37 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
version=22.1.0
-revision=1
+revision=2
wrksrc="Twisted-${version}"
build_style=python3-module
make_check_target=src/twisted
@@ -21,17 +21,6 @@ distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
make_check=ci-skip # some tests fail when running as root
-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
@@ -45,9 +34,9 @@ do_check() {
}
post_install() {
- # don't conflict with python-Twisted
- for f in "${DESTDIR}"/usr/bin/*; do
- mv "${f}"{,3}
+ # compat with previous alternatives group
+ for f in $(ls "${DESTDIR}/usr/bin"); do
+ ln -s "/usr/bin/${f}" "${DESTDIR}/usr/bin/${f}3"
done
vlicense LICENSE
From 2034a88de2f0bd6fa81d8e506b434f87a746345a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:14:10 -0400
Subject: [PATCH 14/29] python-openssl: remove package.
unused dep, python2
---
srcpkgs/python-openssl/template | 15 ---------------
srcpkgs/python-openssl/update | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 srcpkgs/python-openssl/template
delete mode 100644 srcpkgs/python-openssl/update
diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
deleted file mode 100644
index b26391d9fca1..000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-wrksrc="pyOpenSSL-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-cryptography python-six"
-short_desc="Python2 interface to the OpenSSL library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://pyopenssl.org/"
-changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
-checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
diff --git a/srcpkgs/python-openssl/update b/srcpkgs/python-openssl/update
deleted file mode 100644
index 9946902a8048..000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7207e716f98d..dd4426dab122 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,7 @@ replaces="
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-openssl<=20.0.1_2
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
From 784489d518a4c26bcb2ad5c981d536edc3fa6fe3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:18:46 -0400
Subject: [PATCH 15/29] python-service_identity: remove package.
unused dep, python2
---
srcpkgs/python-service_identity/template | 29 -----------------------
srcpkgs/python3-service_identity | 1 -
srcpkgs/python3-service_identity/template | 18 ++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
delete mode 120000 srcpkgs/python3-service_identity
create mode 100644 srcpkgs/python3-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index b0cb27dfbea1..000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=5
-wrksrc="service_identity-${version}"
-build_style=python-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-service_identity_package() {
- depends="python3-attrs python3-pyasn1-modules python3-cryptography"
- pycompile_module="service_identity"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-service_identity b/srcpkgs/python3-service_identity
deleted file mode 120000
index d6ce3b6c55a3..000000000000
--- a/srcpkgs/python3-service_identity
+++ /dev/null
@@ -1 +0,0 @@
-python-service_identity
\ No newline at end of file
diff --git a/srcpkgs/python3-service_identity/template b/srcpkgs/python3-service_identity/template
new file mode 100644
index 000000000000..f82e5f5a4354
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=6
+wrksrc="service_identity-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-attrs python3-pyasn1-modules python3-cryptography"
+short_desc="Service identity verification for Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://service-identity.readthedocs.org/"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dd4426dab122..ffe28f806fa4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -339,6 +339,7 @@ replaces="
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
+ python-service_identity<=18.1.0_5
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
From 6d033624bde11e593fa096ecd919829e393d780d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:23:24 -0400
Subject: [PATCH 16/29] python-pyasn1-modules: remove package.
unused dep, py2
---
srcpkgs/python-pyasn1-modules/template | 35 -------------------------
srcpkgs/python3-pyasn1-modules | 1 -
srcpkgs/python3-pyasn1-modules/template | 19 ++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 20 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
delete mode 120000 srcpkgs/python3-pyasn1-modules
create mode 100644 srcpkgs/python3-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index 2f8fb331c8fc..000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=5
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1 python3-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1-modules"
-distfiles="https://github.com/etingof/pyasn1-modules/archive/v${version}.tar.gz"
-checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
-
-do_check() {
- python setup.py test
- python3 setup.py test
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyasn1-modules_package() {
- depends="python3-pyasn1"
- pycompile_module="pyasn1_modules"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyasn1-modules b/srcpkgs/python3-pyasn1-modules
deleted file mode 120000
index 582f164b8afc..000000000000
--- a/srcpkgs/python3-pyasn1-modules
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1-modules
\ No newline at end of file
diff --git a/srcpkgs/python3-pyasn1-modules/template b/srcpkgs/python3-pyasn1-modules/template
new file mode 100644
index 000000000000..5f6b068439a5
--- /dev/null
+++ b/srcpkgs/python3-pyasn1-modules/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyasn1-modules'
+pkgname=python3-pyasn1-modules
+version=0.2.8
+revision=6
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pyasn1"
+checkdepends="python3-pyasn1"
+short_desc="Collection of ASN.1-based protocols modules (Python3)"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-2-Clause"
+homepage="https://github.com/etingof/pyasn1-modules"
+distfiles="https://github.com/etingof/pyasn1-modules/archive/v${version}.tar.gz"
+checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
+
+post_install() {
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ffe28f806fa4..75e349f32f3f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -328,6 +328,7 @@ replaces="
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
+ python-pyasn1-modules<=0.2.8_5
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
From fcec1ffdab4e558b062e0ca8c9ff997dec807ad2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:26:32 -0400
Subject: [PATCH 17/29] python-pyasn1: remove package.
unused dep, py2
---
srcpkgs/python3-pyasn1 | 1 -
.../template | 23 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 8 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (52%)
diff --git a/srcpkgs/python3-pyasn1 b/srcpkgs/python3-pyasn1
deleted file mode 120000
index 4e5965485530..000000000000
--- a/srcpkgs/python3-pyasn1
+++ /dev/null
@@ -1 +0,0 @@
-python-pyasn1
\ No newline at end of file
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python3-pyasn1/template
similarity index 52%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..14f7bb932f83 100644
--- a/srcpkgs/python-pyasn1/template
+++ b/srcpkgs/python3-pyasn1/template
@@ -1,12 +1,12 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
+# Template file for 'python3-pyasn1'
+pkgname=python3-pyasn1
version=0.4.8
-revision=4
+revision=5
wrksrc="pyasn1-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="ASN.1 library for Python3"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/etingof/pyasn1"
@@ -17,12 +17,3 @@ checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
post_install() {
vlicense LICENSE.rst
}
-
-python3-pyasn1_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 75e349f32f3f..57d26e18a712 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -328,6 +328,7 @@ replaces="
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
+ python-pyasn1<=0.4.8_4
python-pyasn1-modules<=0.2.8_5
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
From 81408444a7861425a435ea8c60b6b3acb88240c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:50:21 -0400
Subject: [PATCH 18/29] python-cryptography: remove packages.
unused dep, py2
---
srcpkgs/python-cryptography/template | 24 ------------------------
srcpkgs/python-cryptography/update | 2 --
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-cryptography/template
delete mode 100644 srcpkgs/python-cryptography/update
diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
deleted file mode 100644
index e3e3405e3c4e..000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=2
-wrksrc="cryptography-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools openssl-devel python-enum34
- python-ipaddress python-six python-cffi python-idna"
-makedepends="openssl-devel python-devel"
-depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
-short_desc="Python2 library that provides cryptographic recipes and primitives"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause, Apache-2.0"
-homepage="https://github.com/pyca/cryptography"
-changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed
-# Test dependency python-iso8601 has been dropped
-make_check=no
-
-post_install() {
- vlicense LICENSE
- vlicense LICENSE.BSD
-}
diff --git a/srcpkgs/python-cryptography/update b/srcpkgs/python-cryptography/update
deleted file mode 100644
index b128c2f3bcf8..000000000000
--- a/srcpkgs/python-cryptography/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# cryptography >= 3.4 does not support Python 2
-pattern="cryptography-\K3\.3\.[0-9.]+(?=.tar.gz)"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57d26e18a712..c8f3a96bf496 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,7 @@ replaces="
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_2
python-cryptography_vectors<=3.3.2_1
python-dateutil<=2.8.2_1
python-decorator<=4.4.2_2
From 3c8fc2f01e46e5f2a59bcccbf881239ec03f102e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:53:06 -0400
Subject: [PATCH 19/29] python-ipaddress: remove package.
unused dep, py2
---
srcpkgs/python-ipaddress/template | 18 ------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/python-ipaddress/template
diff --git a/srcpkgs/python-ipaddress/template b/srcpkgs/python-ipaddress/template
deleted file mode 100644
index 5c88955e45e1..000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-wrksrc="ipaddress-${version}"
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://github.com/phihag/ipaddress"
-distfiles="${PYPI_SITE}/i/ipaddress/ipaddress-${version}.tar.gz"
-checksum=b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c8f3a96bf496..8992554c4164 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -315,6 +315,7 @@ replaces="
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-ipaddress<=1.0.23_2
python-isodate<=0.6.0_5
python-iso8601<=0.1.16_2
python-jellyfish<=0.6.1_2
From 661e3d41ac899edfc6a30be480a695adada4e74f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:10:43 -0400
Subject: [PATCH 20/29] python-cffi: remove package.
unused dep, py2
---
srcpkgs/python3-cffi | 1 -
.../{python-cffi => python3-cffi}/template | 29 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 10 insertions(+), 21 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (56%)
rename srcpkgs/{python-cffi => python3-cffi}/update (100%)
diff --git a/srcpkgs/python3-cffi b/srcpkgs/python3-cffi
deleted file mode 120000
index 8d25d17c4b33..000000000000
--- a/srcpkgs/python3-cffi
+++ /dev/null
@@ -1 +0,0 @@
-python-cffi
\ No newline at end of file
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python3-cffi/template
similarity index 56%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..3f1167bc0321 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python3-cffi/template
@@ -1,14 +1,14 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
+# Template file for 'python3-cffi'
+pkgname=python3-cffi
version=1.15.1
-revision=1
+revision=2
wrksrc="cffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
-depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
-short_desc="C foreign function interface for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools libffi-devel"
+makedepends="python3-devel libffi-devel"
+depends="python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
+short_desc="C foreign function interface for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://cffi.readthedocs.io/"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
@@ -34,12 +32,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-cffi_package() {
- depends="python3-pycparser"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python3-cffi/update
similarity index 100%
rename from srcpkgs/python-cffi/update
rename to srcpkgs/python3-cffi/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8992554c4164..e6816a619d97 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -301,6 +301,7 @@ replaces="
python-SQLAlchemy<=1.3.18_4
python-Twisted<=20.3.0_4
python-audit<=2.8.5_2
+ python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-crypto<=3.9.7_3
From bbdeec7e19d956346b1622dd2dc20fea20e8cece Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 21/29] python-pycparser: remove package.
unused dep, py2
python3-pycparser: fix tests, add changelog
---
srcpkgs/python-pycparser/template | 34 ------------------------------
srcpkgs/python3-pycparser | 1 -
srcpkgs/python3-pycparser/template | 23 ++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 24 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
delete mode 120000 srcpkgs/python3-pycparser
create mode 100644 srcpkgs/python3-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 68ea482d2075..000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.20
-revision=2
-wrksrc="pycparser-${version}"
-build_style=python-module
-pycompile_module="pycparser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
-
-post_install() {
- # replace bundled copy of ply
- for pyver in $py2_ver $py3_ver; do
- rm -rf ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
- ln -sf ../ply ${DESTDIR}/usr/lib/python${pyver}/site-packages/pycparser/ply
- done
- vlicense LICENSE
-}
-
-python3-pycparser_package() {
- depends="python3-ply"
- pycompile_module="pycparser"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pycparser b/srcpkgs/python3-pycparser
deleted file mode 120000
index 00a864b2cf51..000000000000
--- a/srcpkgs/python3-pycparser
+++ /dev/null
@@ -1 +0,0 @@
-python-pycparser
\ No newline at end of file
diff --git a/srcpkgs/python3-pycparser/template b/srcpkgs/python3-pycparser/template
new file mode 100644
index 000000000000..d9303f6b3e92
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=3
+wrksrc="pycparser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ply"
+checkdepends="python3-pytest"
+short_desc="Complete C99 parser in pure Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/eliben/pycparser"
+changelog="https://raw.githubusercontent.com/eliben/pycparser/release_v2.20/CHANGES"
+distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
+checksum=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
+
+post_install() {
+ # replace bundled copy of ply
+ rm -rf ${DESTDIR}/usr/lib/python${py3_ver}/site-packages/pycparser/ply
+ ln -sf ../ply ${DESTDIR}/usr/lib/python${py3_ver}/site-packages/pycparser/ply
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e6816a619d97..e37563dcef4c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,7 @@ replaces="
python-pretend<=1.0.9_5
python-pyasn1<=0.4.8_4
python-pyasn1-modules<=0.2.8_5
+ python-pycparser<=2.20_2
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
From babc3c7ed44889dd8514e1d5f0099782da31903d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 22/29] python-ply: remove package.
unused dep, py2
---
srcpkgs/python3-ply | 1 -
srcpkgs/{python-ply => python3-ply}/template | 23 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 8 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (50%)
diff --git a/srcpkgs/python3-ply b/srcpkgs/python3-ply
deleted file mode 120000
index 805861f2f7af..000000000000
--- a/srcpkgs/python3-ply
+++ /dev/null
@@ -1 +0,0 @@
-python-ply
\ No newline at end of file
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python3-ply/template
similarity index 50%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..30f0418dd7ca 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python3-ply/template
@@ -1,12 +1,12 @@
-# Template file for 'python-ply'
-pkgname=python-ply
+# Template file for 'python3-ply'
+pkgname=python3-ply
version=3.11
-revision=6
+revision=7
wrksrc="ply-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Lex and Yacc for Python3"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="http://www.dabeaz.com/ply/"
@@ -17,12 +17,3 @@ post_install() {
sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
vlicense LICENSE
}
-
-python3-ply_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e37563dcef4c..606f8167a8e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -330,6 +330,7 @@ replaces="
python-openssl<=20.0.1_2
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-ply<=3.11_6
python-pretend<=1.0.9_5
python-pyasn1<=0.4.8_4
python-pyasn1-modules<=0.2.8_5
From 1e866c6aae5627b805f58b05c3ec2826e6000308 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 23/29] python-constantly: remove package.
unused dep, py2
---
srcpkgs/python-constantly/template | 29 -----------------------------
srcpkgs/python3-constantly | 1 -
srcpkgs/python3-constantly/template | 18 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
delete mode 120000 srcpkgs/python3-constantly
create mode 100644 srcpkgs/python3-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 51d9a9f25fef..000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=6
-wrksrc="constantly-${version}"
-build_style=python-module
-pycompile_module="constantly"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/twisted/constantly"
-license="MIT"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-constantly_package() {
- depends="python3"
- pycompile_module="constantly"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-constantly b/srcpkgs/python3-constantly
deleted file mode 120000
index 9f28e618569d..000000000000
--- a/srcpkgs/python3-constantly
+++ /dev/null
@@ -1 +0,0 @@
-python-constantly
\ No newline at end of file
diff --git a/srcpkgs/python3-constantly/template b/srcpkgs/python3-constantly/template
new file mode 100644
index 000000000000..68db4cf1ce95
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=7
+wrksrc="constantly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Symbolic constants in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/twisted/constantly"
+distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
+checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 606f8167a8e9..fd2d520546be 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,7 @@ replaces="
python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_6
python-crypto<=3.9.7_3
python-cryptography<=3.3.2_2
python-cryptography_vectors<=3.3.2_1
From f7c8825527a9a80cf8b2dea32464dc62f3354cff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 24/29] python-incremental: remove package.
unused dep, py2
---
srcpkgs/python3-incremental | 1 -
.../template | 23 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 8 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (58%)
diff --git a/srcpkgs/python3-incremental b/srcpkgs/python3-incremental
deleted file mode 120000
index ce274896aad5..000000000000
--- a/srcpkgs/python3-incremental
+++ /dev/null
@@ -1 +0,0 @@
-python-incremental
\ No newline at end of file
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python3-incremental/template
similarity index 58%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..d59d3e5e3a0b 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python3-incremental/template
@@ -1,12 +1,12 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
+# Template file for 'python3-incremental'
+pkgname=python3-incremental
version=21.3.0
-revision=1
+revision=2
wrksrc="incremental-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Small library that versions your Python projects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/twisted/incremental"
@@ -17,12 +17,3 @@ checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
post_install() {
vlicense LICENSE
}
-
-python3-incremental_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fd2d520546be..0fb1123d76ac 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -317,6 +317,7 @@ replaces="
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-isodate<=0.6.0_5
python-iso8601<=0.1.16_2
From 0ce595eb20d733917eb33e577d2a930ca9c9070c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 25/29] python-automat: remove package.
unused dep, py2
---
srcpkgs/python3-automat | 1 -
.../template | 27 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 10 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-automat
rename srcpkgs/{python-automat => python3-automat}/template (54%)
diff --git a/srcpkgs/python3-automat b/srcpkgs/python3-automat
deleted file mode 120000
index 2df0fb5b1fc3..000000000000
--- a/srcpkgs/python3-automat
+++ /dev/null
@@ -1 +0,0 @@
-python-automat
\ No newline at end of file
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python3-automat/template
similarity index 54%
rename from srcpkgs/python-automat/template
rename to srcpkgs/python3-automat/template
index 3487b14abce8..c2c3d6c31cfd 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python3-automat/template
@@ -1,13 +1,13 @@
-# Template file for 'python-automat'
-pkgname=python-automat
+# Template file for 'python3-automat'
+pkgname=python3-automat
version=20.2.0
-revision=4
+revision=5
wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
+short_desc="Finite-state machines in Python (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
@@ -28,15 +28,6 @@ do_check() {
post_install() {
vlicense LICENSE
-}
-
-python3-automat_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-setuptools python3-attrs python3-six"
- alternatives="automat:automat-visualize:/usr/bin/automat-visualize3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
+ # compatibility with previous binary
+ ln -s /usr/bin/automat-visualize ${DESTDIR}/usr/bin/automat-visualize3
}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0fb1123d76ac..9c6c69a7fde9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -301,6 +301,7 @@ replaces="
python-SQLAlchemy<=1.3.18_4
python-Twisted<=20.3.0_4
python-audit<=2.8.5_2
+ python-automat<=20.2.0_4
python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
From 66416c78456109285090310708e52255d4da7fb2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 26/29] python-hyperlink: remove package.
unused dep, py2
---
srcpkgs/python-hyperlink/template | 34 ------------------------------
srcpkgs/python3-hyperlink | 1 -
srcpkgs/python3-hyperlink/template | 19 +++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 20 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
delete mode 120000 srcpkgs/python3-hyperlink
create mode 100644 srcpkgs/python3-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 710b8eb13db8..000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=2
-wrksrc="hyperlink-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-
-do_check() {
- python3 -m pytest build-${py3_ver}
- # python 2 tests fail
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-hyperlink_package() {
- depends="python3-idna"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-hyperlink b/srcpkgs/python3-hyperlink
deleted file mode 120000
index bd21bced19d0..000000000000
--- a/srcpkgs/python3-hyperlink
+++ /dev/null
@@ -1 +0,0 @@
-python-hyperlink
\ No newline at end of file
diff --git a/srcpkgs/python3-hyperlink/template b/srcpkgs/python3-hyperlink/template
new file mode 100644
index 000000000000..0fcefcca41a7
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=3
+wrksrc="hyperlink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-idna"
+checkdepends="python3-idna python3-pytest"
+short_desc="Pure-Python implementation of immutable URLs (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-hyper/hyperlink"
+distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
+checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9c6c69a7fde9..c931e8f12c8d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -318,6 +318,7 @@ replaces="
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_2
python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-isodate<=0.6.0_5
From cd9b2ebf449fbe4066c8be4bf82cfe1e51f6bf4a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 27/29] python-idna: remove package.
unused dep, py2
---
srcpkgs/python-idna/template | 19 -------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 srcpkgs/python-idna/template
diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template
deleted file mode 100644
index 05101f64b883..000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-wrksrc="idna-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/kjd/idna"
-changelog="https://raw.githubusercontent.com/kjd/idna/master/HISTORY.rst"
-distfiles="${PYPI_SITE}/i/idna/idna-${version}.tar.gz"
-checksum=b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c931e8f12c8d..0a0662850a52 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -319,6 +319,7 @@ replaces="
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
python-hyperlink<=21.0.0_2
+ python-idna<=2.10_1
python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-isodate<=0.6.0_5
From 48921fba9ac590191b72b8304fa9262585080a55 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 01:15:58 -0400
Subject: [PATCH 28/29] python-typing: remove package.
unused dep, py2
---
srcpkgs/python-typing/template | 18 ------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0a0662850a52..910ccc6fce1b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -357,6 +357,7 @@ replaces="
python-sqlite<=2.8.3_1
python-sqlparse<=0.3.0_5
python-tempita<=0.5.2_7
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
From a78b3cc7ea51d824f4ea25d97f6c1bb92dfa1376 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 29/29] python-PyHamcrest: remove package.
unused dep, py2
---
srcpkgs/python-PyHamcrest/template | 33 -----------------------------
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 23 ++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 24 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index 34b26e0dfd48..000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=5
-wrksrc="PyHamcrest-${version}"
-build_style=python-module
-pycompile_module="hamcrest"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
-checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
-
-pre_build() {
- # drop setuptools from runtime requires
- sed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-PyHamcrest_package() {
- depends="python3-six"
- pycompile_module="hamcrest"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..e436d082ccfd
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=1.9.0
+revision=6
+wrksrc="PyHamcrest-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
+checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+
+pre_build() {
+ # drop setuptools from runtime requires
+ sed -i "/install_requires=/s|'setuptools',||" setup.py
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 910ccc6fce1b..031cb85fbe77 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,7 @@ replaces="
python-M2Crypto<=0.35.2_7
python-MarkupSafe<=1.1.1_7
python-Pillow<=6.2.2_3
+ python-PyHamcrest<=1.9.0_5
python-Pygments<=2.5.2_4
python-PyQt4<=4.12.1_4
python-SecretStorage<=2.3.1_4
next prev parent reply other threads:[~2022-08-17 5:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:06 [PR PATCH] " classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
2022-08-17 5:37 ` classabbyamp [this message]
2022-08-17 5:42 ` classabbyamp
2022-08-17 5:43 ` classabbyamp
2022-08-17 5:58 ` classabbyamp
2022-08-17 21:56 ` classabbyamp
2022-08-17 22:22 ` classabbyamp
2022-08-17 22:29 ` classabbyamp
2022-08-17 22:31 ` classabbyamp
2022-08-17 22:40 ` classabbyamp
2022-08-17 22:54 ` classabbyamp
2022-08-17 23:16 ` classabbyamp
2022-08-17 23:24 ` classabbyamp
2022-08-17 23:52 ` classabbyamp
2022-10-06 10:59 ` classabbyamp
2022-10-06 11:38 ` classabbyamp
2022-10-06 11:52 ` classabbyamp
2023-01-05 1:59 ` github-actions
2023-01-05 4:31 ` classabbyamp
2023-04-28 1:53 ` github-actions
2023-07-28 1:48 ` github-actions
2023-10-11 21:45 ` [PR PATCH] [Updated] " classabbyamp
2024-04-18 0:06 ` classabbyamp
2024-04-18 0:07 ` [NOMERGE] buildbot, deps, python 2: remove classabbyamp
2024-04-18 0:07 ` classabbyamp
2024-04-18 0:18 ` [PR PATCH] [Updated] " classabbyamp
2024-09-27 19:17 ` leahneukirchen
2024-09-28 8:57 ` [PR PATCH] [Updated] " classabbyamp
2024-09-28 9:01 ` classabbyamp
2024-09-28 9:02 ` classabbyamp
2024-09-28 9:03 ` classabbyamp
2024-09-28 9:15 ` [PR PATCH] [Updated] " classabbyamp
2024-09-29 3:21 ` [PR PATCH] [Merged]: buildbot, deps: remove; python -> python2 classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220817053708.3_m8xnKquuULyk24bmF2xW2XJSwHyg4vC70495JymAI@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).