* [PR PATCH] [NOMERGE] buildbot & deps: remove
@ 2022-08-17 5:06 classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
` (32 more replies)
0 siblings, 33 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]
There is a new 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-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.
#### 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: 78052 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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 0126b265e0e28cfd938e40599729290d9dcabf09 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 21/28] python-pycparser: remove package.
unused dep, py2
---
srcpkgs/python-pycparser/template | 34 ------------------------------
srcpkgs/python3-pycparser | 1 -
srcpkgs/python3-pycparser/template | 21 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..3c7fab01236a
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,21 @@
+# 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"
+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"
+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 c59465f19d959b434523c7993e8b522696739157 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 22/28] 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 bf2462a687bf67c3080aeb9f56f139314d34beb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 23/28] 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 2f52a786ed0ffbe7abfa8ba4f80ed0b91ff1ebe1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 24/28] 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 a86746958dcbd13bae39b4012ba4b969db86d605 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 25/28] 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 67a21b3f0f4884e014e7108d9af0ad803ff5b28a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 26/28] 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 b6139b00d41eead58fa797a622126e014b1f64a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 27/28] 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 1ae5a94164f3285d25ca782f2644ff210b5bac8d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 28/28] 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 0a0662850a52..fb1b77906fec 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
@ 2022-08-17 5:16 ` classabbyamp
2022-08-17 5:37 ` classabbyamp
` (31 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1606 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-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.
#### 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: 79658 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 0126b265e0e28cfd938e40599729290d9dcabf09 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
---
srcpkgs/python-pycparser/template | 34 ------------------------------
srcpkgs/python3-pycparser | 1 -
srcpkgs/python3-pycparser/template | 21 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..3c7fab01236a
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,21 @@
+# 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"
+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"
+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 c59465f19d959b434523c7993e8b522696739157 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 bf2462a687bf67c3080aeb9f56f139314d34beb1 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 2f52a786ed0ffbe7abfa8ba4f80ed0b91ff1ebe1 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 a86746958dcbd13bae39b4012ba4b969db86d605 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 67a21b3f0f4884e014e7108d9af0ad803ff5b28a 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 b6139b00d41eead58fa797a622126e014b1f64a4 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 fdd2ff8f350716c7d854a373f616d9cf5ca26075 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 b367807f7b4d62a65e44f38ceb0aa72aa6e55677 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-08-17 5:37 ` classabbyamp
2022-08-17 5:42 ` classabbyamp
` (30 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:37 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
2022-08-17 5:37 ` classabbyamp
@ 2022-08-17 5:42 ` classabbyamp
2022-08-17 5:43 ` classabbyamp
` (29 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:42 UTC (permalink / raw)
To: ml
[-- 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: 79848 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 c53c9aa930f2219cce50a7cd090510f3abf57159 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 | 24 +++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 25 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..6e539631fad3
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,24 @@
+# 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"
+checkdepends="$depends"
+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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (2 preceding siblings ...)
2022-08-17 5:42 ` classabbyamp
@ 2022-08-17 5:43 ` classabbyamp
2022-08-17 5:58 ` classabbyamp
` (28 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:43 UTC (permalink / raw)
To: ml
[-- 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: 79879 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 10f967d99c5cf523d0d7c070f3710c43c7063946 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
python3-PyHamcrest: fix tests
---
srcpkgs/python-PyHamcrest/template | 33 -----------------------------
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 24 +++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 25 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..6e539631fad3
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,24 @@
+# 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"
+checkdepends="$depends"
+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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (3 preceding siblings ...)
2022-08-17 5:43 ` classabbyamp
@ 2022-08-17 5:58 ` classabbyamp
2022-08-17 21:56 ` classabbyamp
` (27 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 5:58 UTC (permalink / raw)
To: ml
[-- 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: 79918 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 e5ef990923620ba5040c02cbb0f80264e80fefa2 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
python3-PyHamcrest: disable tests
---
srcpkgs/python-PyHamcrest/template | 33 -----------------------------
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 25 ++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 26 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..ef9c5f1b0165
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,25 @@
+# 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
+# does not run, even with all dependencies
+make_check=no
+
+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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (4 preceding siblings ...)
2022-08-17 5:58 ` classabbyamp
@ 2022-08-17 21:56 ` classabbyamp
2022-08-17 22:22 ` classabbyamp
` (26 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 21:56 UTC (permalink / raw)
To: ml
[-- 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: 79253 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 b3e03241aa8b35c0c252112d64bed23a5ae3c031 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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 d830328ec07fc8624edd5441bd6016ce6b227055 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 1c66b57497a50d1ff20a4946b090e1da368bf754 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 147ae956284b0d0a621e88284783386147a1caa4 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 8f6e0538d6b1cd2ab03b5e9ee6128d5b665d3f4a 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 f44a1ffab5581b4ccf25325b80e3ff64f161f136 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 4f20216e18c5ebc8b5f5f60d1a35fd944f985a4e 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..fdb0086bb211
--- /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=5
+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 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 e42fc2698e241054f4ece4b0c30b3ca69c66278d 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2e3a795dbcaedbeb3bfe5d56036dd7b477bee2e9 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 0f90f2944b3b3c0e76933daf79bc3b50c7fff110 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 bad33f98ec7c147e6f3e87ea5bf23786467fb3ac 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 9686dbb2fbbc16afdf321561b0963ba464ce7bad 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 6014b2f340ae4572b2a0e6a5354e8bf0e0c4ea19 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 333141afeb0b414b28c881cdaadb340c0ebdbef6 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 e57ccb16b12b66a994a15887f3007d86739ce333 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8930d34deb0cdd091a8203b7e4b577869bacdbb5 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 494b9bdb2c7b36318e11a4444404c69a4a59cdb7 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 9861dd6b236f35d4a108b365c0b3153a24c5a27e 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 c009707de28b54d62cc85a8e69fe19aa4e2783e8 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 d8a4610c636fac90483317c862ead94b54c056df 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 3306873c6a0a60f296c925408d092a5ca3b0c533 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (5 preceding siblings ...)
2022-08-17 21:56 ` classabbyamp
@ 2022-08-17 22:22 ` classabbyamp
2022-08-17 22:29 ` classabbyamp
` (25 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 22:22 UTC (permalink / raw)
To: ml
[-- 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: 79654 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 b3e03241aa8b35c0c252112d64bed23a5ae3c031 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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 d830328ec07fc8624edd5441bd6016ce6b227055 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 1c66b57497a50d1ff20a4946b090e1da368bf754 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 147ae956284b0d0a621e88284783386147a1caa4 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 8f6e0538d6b1cd2ab03b5e9ee6128d5b665d3f4a 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 f44a1ffab5581b4ccf25325b80e3ff64f161f136 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 4f20216e18c5ebc8b5f5f60d1a35fd944f985a4e 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..fdb0086bb211
--- /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=5
+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 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 e42fc2698e241054f4ece4b0c30b3ca69c66278d 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2e3a795dbcaedbeb3bfe5d56036dd7b477bee2e9 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 0f90f2944b3b3c0e76933daf79bc3b50c7fff110 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 bad33f98ec7c147e6f3e87ea5bf23786467fb3ac 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 9686dbb2fbbc16afdf321561b0963ba464ce7bad 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 6014b2f340ae4572b2a0e6a5354e8bf0e0c4ea19 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 333141afeb0b414b28c881cdaadb340c0ebdbef6 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 e57ccb16b12b66a994a15887f3007d86739ce333 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8930d34deb0cdd091a8203b7e4b577869bacdbb5 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 1c323e59f9311b19624efff9d318e5cded0b6c3e 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
python3-automat: disable tests in CI
---
srcpkgs/python3-automat | 1 -
.../template | 29 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 12 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..320a18cee7f5 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python3-automat/template
@@ -1,19 +1,21 @@
-# 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"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
pre_build() {
sed -i setup.py \
@@ -28,15 +30,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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 2f5cc24a759fc12589160d08fe9a38b0db5a460a 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 1174176886754aee2de707b2adc6f302171cbd29 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 07e6a34ad7af3177a271ee6b34acfe846ccd6135 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 0f942a35fb3c31b564f5f46a2060ccacf12aef9a 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (6 preceding siblings ...)
2022-08-17 22:22 ` classabbyamp
@ 2022-08-17 22:29 ` classabbyamp
2022-08-17 22:31 ` classabbyamp
` (24 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 22:29 UTC (permalink / raw)
To: ml
[-- 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: 80676 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 b3e03241aa8b35c0c252112d64bed23a5ae3c031 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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 d830328ec07fc8624edd5441bd6016ce6b227055 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 1c66b57497a50d1ff20a4946b090e1da368bf754 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 147ae956284b0d0a621e88284783386147a1caa4 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 8f6e0538d6b1cd2ab03b5e9ee6128d5b665d3f4a 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 f44a1ffab5581b4ccf25325b80e3ff64f161f136 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 4f20216e18c5ebc8b5f5f60d1a35fd944f985a4e 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..fdb0086bb211
--- /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=5
+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 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 e42fc2698e241054f4ece4b0c30b3ca69c66278d 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2e3a795dbcaedbeb3bfe5d56036dd7b477bee2e9 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 0f90f2944b3b3c0e76933daf79bc3b50c7fff110 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 bad33f98ec7c147e6f3e87ea5bf23786467fb3ac 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 9686dbb2fbbc16afdf321561b0963ba464ce7bad 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 6014b2f340ae4572b2a0e6a5354e8bf0e0c4ea19 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 333141afeb0b414b28c881cdaadb340c0ebdbef6 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 e57ccb16b12b66a994a15887f3007d86739ce333 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8930d34deb0cdd091a8203b7e4b577869bacdbb5 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 4c412b04e32ff4cb01c1bf2cc04f357e4c1da65e 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..f7c2b198c6ad
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 a909f3614b0a0ac72d8bb44ac8a3aa4844119cea 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 a37258151b25a37aa4fbd198f3492266b7238744 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 34d84fc2c00c1e4029ee1a263f6c8de98da2ef8b 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 ebbc0c40b73f8c2e7eaea0b2db823a655b8f2afd 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (7 preceding siblings ...)
2022-08-17 22:29 ` classabbyamp
@ 2022-08-17 22:31 ` classabbyamp
2022-08-17 22:40 ` classabbyamp
` (23 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 22:31 UTC (permalink / raw)
To: ml
[-- 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: 80677 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 b3e03241aa8b35c0c252112d64bed23a5ae3c031 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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 d830328ec07fc8624edd5441bd6016ce6b227055 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 1c66b57497a50d1ff20a4946b090e1da368bf754 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 147ae956284b0d0a621e88284783386147a1caa4 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 8f6e0538d6b1cd2ab03b5e9ee6128d5b665d3f4a 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 f44a1ffab5581b4ccf25325b80e3ff64f161f136 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 4f20216e18c5ebc8b5f5f60d1a35fd944f985a4e 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..fdb0086bb211
--- /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=5
+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 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 e42fc2698e241054f4ece4b0c30b3ca69c66278d 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2e3a795dbcaedbeb3bfe5d56036dd7b477bee2e9 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 0f90f2944b3b3c0e76933daf79bc3b50c7fff110 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 bad33f98ec7c147e6f3e87ea5bf23786467fb3ac 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 9686dbb2fbbc16afdf321561b0963ba464ce7bad 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 6014b2f340ae4572b2a0e6a5354e8bf0e0c4ea19 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 333141afeb0b414b28c881cdaadb340c0ebdbef6 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 e57ccb16b12b66a994a15887f3007d86739ce333 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8930d34deb0cdd091a8203b7e4b577869bacdbb5 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 c8ee94ab98dbb55b9e199b35fb33018dde2ac73d 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 6510eea0a5e5a6fb9478f32fed651e9a7e27696e 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 940207dd6ad041d54f39b37d652fc06d15d5e77e 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 978130b1a3c9116c23745d2c326627fa28047a65 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 7b2b379af3be5933142dc55bc4fceb2e10aff817 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (8 preceding siblings ...)
2022-08-17 22:31 ` classabbyamp
@ 2022-08-17 22:40 ` classabbyamp
2022-08-17 22:54 ` classabbyamp
` (22 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 22:40 UTC (permalink / raw)
To: ml
[-- 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: 80791 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 b3e03241aa8b35c0c252112d64bed23a5ae3c031 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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 d830328ec07fc8624edd5441bd6016ce6b227055 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 1c66b57497a50d1ff20a4946b090e1da368bf754 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 147ae956284b0d0a621e88284783386147a1caa4 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 8f6e0538d6b1cd2ab03b5e9ee6128d5b665d3f4a 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 f44a1ffab5581b4ccf25325b80e3ff64f161f136 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 e276ebcbde3f9cd52a1d167c437660cf6c68b5ee 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 | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 d323bef184aab2d5cc1b4f2549232a15caff9bbc 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 c886ed9b8d899b3635efab5e6c8bf0583dc7cb0b 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 0be9022dc7fa98b8a564b90fed9c64cfeda1d387 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 e172ecca616517d8e17ca3eca06b602e64b66d87 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 a79083057f850fcb4f09623d59b88f3dfcb0f8c6 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 a2c7d8d5ea4632c4dfdaec8a1c3f0533e8c1ed46 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 443df512bed4c9a44672eab9207920d47b871027 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 a4b3e9828a7b410f4f02bfc8bedcde8e4065763f 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 f1b1596f09e557df95186a2eb1f79bc3bbbda607 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 0acbc7e59ba989eea7b5859256c4d68b434445d4 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 ff9969a08cb494132fd69c72f1a2d3c5a2012fcf 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 b4e83d4f240b0474383aa310fcb6fe162f9dac3a 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 b0914453ba2ca1fdf929b8215c718392e01e9342 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 5cdd098fdbce68121f1a1c6419adbdf33c1112fa 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (9 preceding siblings ...)
2022-08-17 22:40 ` classabbyamp
@ 2022-08-17 22:54 ` classabbyamp
2022-08-17 23:16 ` classabbyamp
` (21 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 22:54 UTC (permalink / raw)
To: ml
[-- 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: 82666 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 31be9b5db730ebf861230a834387aa5d082199be 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..1c0732acfcfa
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 b6ebb8a289ae8e9eb48c91b214fc790b61339144 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 f704407a3b00f1ac7977d53aa7066c2461eeb19f 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 0388a077e2017b7c89082b3c7dd79ff47367cbd3 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 e7e40c9a4dc7084f16b0fde6e7711b1100a24ea4 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
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 db1be0c0d98f5b439478e9d21529fccf49f35089 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 e40bd814604dd853b5e95439fc158c4af5827f85 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 4bfd34f6edd3c14af99dc40d03df95552973a6cf 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 50bc490b5d40f5a278d72a4dc41489783c8ac3a6 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 639975a1a385b3cc93be55d8b38127df1212ad89 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 c1b3c98ca0c655b76849caa2bfc83732c44c5677 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 | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 a889476c72b7b1a5fe5f2a2bfc96870e67c0f34f 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 bad62a643dad65b03e94c7a8222dc0f297cc0435 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 18d27947dee21641b0eeecb48f3b4705dcb966c7 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 4832a5acad52f736d6e37d3ae4839966d77f4ec9 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 fb00e94dd8ab43f19bf0cce3f81fac02bb31465a 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 335ecf2d723ace818128e8a36c3fc5e64e18017d 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 0aafe76927cbc4891f38b48fd5d1cc93ff2d5cf9 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 68d895b0a19a38b762a8dab0d298e74c75219358 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 d7b6fcd1942d6dc617d87e11ba2932320cbd2631 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 feb5bd5dc001f5e73dff1436a24a3c0dc2ffc59d 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 057098d0736f5bd367a69b28484e751544cee789 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 48556e03b8b8857618fa0ed52b24db1e282e7b62 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 b9e84448d50d7fd5277b1fb37ed85a166e10d30b 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 5f0f6881373e16ff8450ed57e7d532c41f68e4ae 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (10 preceding siblings ...)
2022-08-17 22:54 ` classabbyamp
@ 2022-08-17 23:16 ` classabbyamp
2022-08-17 23:24 ` classabbyamp
` (20 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 23:16 UTC (permalink / raw)
To: ml
[-- 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: 84637 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 c6ec10829880a47c2ca9407b2bdf4500683f79b3 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
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 bb4404becad727a809453df3b252803444249b24 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 69cbf9f8375ed395711347790c871c5cd66db558 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 e7e5de2ed6445647f4954015256f088a0b76005f 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 706e84f68ea525c6aab73b5fcc4d12e99fc6fbb2 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
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 b81065af9862540ede023c57796d4544be3c9b51 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 7471fd73f7006caa680c3012f47643b0b502ab3b 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 358909c27fcb4e99544b438bbfb457fb00f1999e 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 e6aed53a17d6664b82dc1b0fcaa5abeae37f69e9 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 cd177e6ed4434d64d4a7714579134a6c12a35f13 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 96d2a973cd47e86e07430ecbe7d355e01e7738ab 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 | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 be8ca3aa06aa4213f89160c8254a6dbeb81adaad 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 be7c3faf14561ce668bf19f19665975cab535087 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2a79b697c88d2344890ec65e94c730d6fe0b4166 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 fd2eb0ad878d75c1cd59e518fff3ac9440653f1c 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 f542e4d51c1b2ccb18e12272014e1cc598ebd35e 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 | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 5fcf342e0d5b13df46d8fbb4fb98e85f35ba6b05 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 639b019c4640b5ebc01230222c6b39adc564b660 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 4f3b2a1e787bb4b5880404c99636d7e5b1fd85a8 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8b93080de00ac54b468d87461bc4bfaf68e5949d 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 6e7fd1cb57c34ed0b7e65206ca49021b9bcbac84 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 ec9e660d9e6901841c6e7ea9f6835b04486a1e34 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 e6e0dc0bb08389b503d13e72a215bc79bcc4a325 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 916d497645e864430f0a7da20a82f8c14497694e 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 d279d215f3b85e150bf9fd361e244e8b7dde3b7d 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (11 preceding siblings ...)
2022-08-17 23:16 ` classabbyamp
@ 2022-08-17 23:24 ` classabbyamp
2022-08-17 23:52 ` classabbyamp
` (19 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 23:24 UTC (permalink / raw)
To: ml
[-- 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: 85408 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:12:26 -0400
Subject: [PATCH 01/30] 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:13:06 -0400
Subject: [PATCH 02/30] 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:04:26 -0400
Subject: [PATCH 03/30] 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:06:51 -0400
Subject: [PATCH 04/30] 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 c6ec10829880a47c2ca9407b2bdf4500683f79b3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:28:37 -0400
Subject: [PATCH 05/30] python-dateutil: remove package.
unused dependency, python 2
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 bb4404becad727a809453df3b252803444249b24 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:55:43 -0400
Subject: [PATCH 06/30] 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 69cbf9f8375ed395711347790c871c5cd66db558 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:17:57 -0400
Subject: [PATCH 07/30] 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 e7e5de2ed6445647f4954015256f088a0b76005f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:30:32 -0400
Subject: [PATCH 08/30] 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..048dccc54db8
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 706e84f68ea525c6aab73b5fcc4d12e99fc6fbb2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:42:57 -0400
Subject: [PATCH 09/30] python-sqlparse: remove package.
unused dep, python2
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 b81065af9862540ede023c57796d4544be3c9b51 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:46:19 -0400
Subject: [PATCH 10/30] 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 7471fd73f7006caa680c3012f47643b0b502ab3b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:11:31 -0400
Subject: [PATCH 11/30] 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 358909c27fcb4e99544b438bbfb457fb00f1999e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:06 -0400
Subject: [PATCH 12/30] 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 e6aed53a17d6664b82dc1b0fcaa5abeae37f69e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:25 -0400
Subject: [PATCH 13/30] 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 cd177e6ed4434d64d4a7714579134a6c12a35f13 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:14:10 -0400
Subject: [PATCH 14/30] 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 96d2a973cd47e86e07430ecbe7d355e01e7738ab Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:18:46 -0400
Subject: [PATCH 15/30] python-service_identity: remove package.
unused dep, python2
---
srcpkgs/python-service_identity/template | 29 -----------------------
srcpkgs/python3-service_identity | 1 -
srcpkgs/python3-service_identity/template | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 be8ca3aa06aa4213f89160c8254a6dbeb81adaad Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:23:24 -0400
Subject: [PATCH 16/30] 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 be7c3faf14561ce668bf19f19665975cab535087 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:26:32 -0400
Subject: [PATCH 17/30] python-pyasn1: remove package.
unused dep, py2
---
srcpkgs/python3-pyasn1 | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 2a79b697c88d2344890ec65e94c730d6fe0b4166 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:50:21 -0400
Subject: [PATCH 18/30] python-cryptography: remove package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 fd2eb0ad878d75c1cd59e518fff3ac9440653f1c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:53:06 -0400
Subject: [PATCH 19/30] 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 f542e4d51c1b2ccb18e12272014e1cc598ebd35e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:10:43 -0400
Subject: [PATCH 20/30] python-cffi: remove package.
unused dep, py2
---
srcpkgs/python3-cffi | 1 -
.../{python-cffi => python3-cffi}/template | 27 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (57%)
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 57%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..9832e085607d 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
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 5fcf342e0d5b13df46d8fbb4fb98e85f35ba6b05 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 21/30] 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 639b019c4640b5ebc01230222c6b39adc564b660 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 22/30] python-ply: remove package.
unused dep, py2
---
srcpkgs/python3-ply | 1 -
srcpkgs/{python-ply => python3-ply}/template | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 4f3b2a1e787bb4b5880404c99636d7e5b1fd85a8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 23/30] 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8b93080de00ac54b468d87461bc4bfaf68e5949d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 24/30] python-incremental: remove package.
unused dep, py2
---
srcpkgs/python3-incremental | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 6e7fd1cb57c34ed0b7e65206ca49021b9bcbac84 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 25/30] python-automat: remove package.
unused dep, py2
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 ec9e660d9e6901841c6e7ea9f6835b04486a1e34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 26/30] 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 e6e0dc0bb08389b503d13e72a215bc79bcc4a325 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 27/30] 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 916d497645e864430f0a7da20a82f8c14497694e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 01:15:58 -0400
Subject: [PATCH 28/30] 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 d279d215f3b85e150bf9fd361e244e8b7dde3b7d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 29/30] python-PyHamcrest: remove package.
unused dep, py2
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
From 3d2a2efa3df5104029cc54e49f9d39960f61252c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 19:24:31 -0400
Subject: [PATCH 30/30] fixup! python-cffi: remove package.
---
srcpkgs/python3-cffi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-cffi/template b/srcpkgs/python3-cffi/template
index 9832e085607d..7881ba70114b 100644
--- a/srcpkgs/python3-cffi/template
+++ b/srcpkgs/python3-cffi/template
@@ -25,7 +25,7 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+ PYTHONPATH="$(cd build/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (12 preceding siblings ...)
2022-08-17 23:24 ` classabbyamp
@ 2022-08-17 23:52 ` classabbyamp
2022-10-06 10:59 ` classabbyamp
` (18 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-08-17 23:52 UTC (permalink / raw)
To: ml
[-- 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: 84751 bytes --]
From c41b22102e137cd9aedf354dc0c41cd08d1443eb 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 272d240a429d..f93eac543799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -29,6 +29,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 061c6c4381f7e374534417d3d4d78a2b49ede7cd 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 f93eac543799..c70281efaec9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -30,6 +30,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 d644ebdb991e12ce7fd9277c2615c70f238594d5 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 c70281efaec9..46088334c8c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -295,6 +295,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 b1de1f0ccb1f6edb078714a5c1616c56a6e176a6 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 46088334c8c4..4fe2915e76ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -297,6 +297,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 c6ec10829880a47c2ca9407b2bdf4500683f79b3 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
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 4fe2915e76ae..ef60a2f0de3a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,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 bb4404becad727a809453df3b252803444249b24 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 ef60a2f0de3a..b00bf2681319 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,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
@@ -365,6 +366,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 69cbf9f8375ed395711347790c871c5cd66db558 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 b00bf2681319..a96ad77ac8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,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
@@ -367,6 +368,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 bf3ac1b9cc84ac047ad605fe326bc3d8d09d4f7b 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 | 21 ++++++++++++++
.../update | 0
srcpkgs/removed-packages/template | 1 +
5 files changed, 22 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..2ffb6face111
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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
+# incompatible with packaged pytest version, probably can be removed when updated
+make_check=no
+
+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 a96ad77ac8b6..83a29d2c6ac0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -302,6 +302,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 e3915441f03601c3d9cf6476f3dab6729a683907 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
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 83a29d2c6ac0..fd27bc2b8e00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -343,6 +343,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 6b458038a885ed4265bbb9a37d30cc0a12df7799 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 fd27bc2b8e00..6e22302999c1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 8f1fac0c9b88fe4ba89faab4b0ed1117de8a4319 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 6e22302999c1..7ee831522d62 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 56e8fc5871072bac2d7d2f796d0952767434c5bf 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 7ee831522d62..3074e577dacf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -304,6 +304,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 22ca6b5a01032075a2b0d2442045313d07d38aab 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 72e1efcc4567db6c64724ffcd5879b9b29241ac4 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 3074e577dacf..10cfd279dd5e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -329,6 +329,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 a29eb12aeebca4869f037b96a93023074ed4ba8d 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 | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 10cfd279dd5e..f35c5506d9c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -344,6 +344,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 3d78230a6a20bf8aaada1ba6436c180bfc15c39e 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..b69ffefafeaf
--- /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=5
+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 f35c5506d9c2..b9fdd18f5b00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 26950f652694686e9e80fa1723026ba9aa297083 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 b9fdd18f5b00..8cd529e7c5e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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 9a7d1a2e0a3e990219c646c20f3cec835a6b17a1 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 package.
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 8cd529e7c5e3..410a7ba36432 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 dcd845bd1cd08e56b49229237de0f6263ebefdb8 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 410a7ba36432..07adfb61add3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,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 48ea847e31d0e3b9ba49cb18cb8241d42e7c1261 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 (53%)
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 53%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 5a098995a96f..7881ba70114b 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
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,21 +25,10 @@ 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)" \
+ PYTHONPATH="$(cd build/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
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 07adfb61add3..bb6a90815b34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 ec5e7b185f72f0817e22f285a99eb5a73992de20 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bb6a90815b34..55d592f74055 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,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 89ff1dd896d0105c57ad189a4c0896777b6e40d5 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 | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 55d592f74055..f9423cb83fff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -335,6 +335,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 28691e1368f3045db72144c5032d4c16ef6034cf 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 f9423cb83fff..67e724170c2d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -309,6 +309,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 ae86e1a1d8a1899df4361ce32fd15651eb8071fa 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 | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 67e724170c2d..96baadb1529b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,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 11518305781ea97c5fa1f271255151175ebbdf93 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
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 39 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 96baadb1529b..63a2cea77544 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -306,6 +306,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 f4d71846af8f70a30d83523ed4cb14980666c1b3 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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 63a2cea77544..7ebb46c56e57 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -323,6 +323,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 157eeacc21ed16504b0d999a8312d7ea4e577d5d 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 7ebb46c56e57..528d9cd02345 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -324,6 +324,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 66c385a5db4e635ef82cfddbed94ebe5caa23ec7 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 528d9cd02345..e881e60df553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -362,6 +362,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 4acd4dafaf0e7d8c9be09584f4606fa4886dde59 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
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e881e60df553..fec604fff8fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (13 preceding siblings ...)
2022-08-17 23:52 ` classabbyamp
@ 2022-10-06 10:59 ` classabbyamp
2022-10-06 11:38 ` classabbyamp
` (17 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-10-06 10:59 UTC (permalink / raw)
To: ml
[-- 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: 79801 bytes --]
From 313a5808364e7b3c10e7d1058f2ae7012b41d073 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:12:26 -0400
Subject: [PATCH 01/28] 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 03bef6a42b2f..8d7bc0b7e4e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -34,6 +34,7 @@ replaces="
bgc<=1.0.1_1
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 bc76468ca61aee7c057b6726cded4ffd13be35aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:13:06 -0400
Subject: [PATCH 02/28] 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 8d7bc0b7e4e6..11afb3fcba84 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,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 e99d5951e247e97554f2651499f9d301a4a5ff84 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:04:26 -0400
Subject: [PATCH 03/28] python-Jinja2: remove package.
unused dependency, Python 2.
---
srcpkgs/python-Jinja2/update | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 srcpkgs/python-Jinja2/update
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 11afb3fcba84..4e24277f3f00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -331,6 +331,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-PyQt4<=4.12.1_4
From 1a21817114d44d0b862d868d504c8394549348d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:06:51 -0400
Subject: [PATCH 04/28] 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 4e24277f3f00..607945b8db9c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
From 6a43fe4f8b8165943541aec8f8d791fd97e95b4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:28:37 -0400
Subject: [PATCH 05/28] python-dateutil: remove package.
unused dependency, python 2
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 607945b8db9c..5a884b39a1c3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,7 @@ replaces="
python-coverage<=5.0.3_3
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 96ecebe19e55ad802e35d7f2760a39b39e568eca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:55:43 -0400
Subject: [PATCH 06/28] 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 5a884b39a1c3..28fce61dc2a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -397,6 +397,7 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
python-typing<=3.6.6_2
python-unicorn>=0
@@ -426,6 +427,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 fb8a8c564abeebda590eca0373c920f487255fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:17:57 -0400
Subject: [PATCH 07/28] 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 28fce61dc2a0..2be2c124cd7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -399,6 +399,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-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -428,6 +429,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 18f0645ca0ef162cd43eefa3a78bf8dfb46f3c40 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:30:32 -0400
Subject: [PATCH 08/28] python-SQLAlchemy: remove package.
unused dep, python2.
---
srcpkgs/python3-SQLAlchemy | 1 -
srcpkgs/python3-SQLAlchemy/template | 21 +++++++++++++++++++
.../update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 insertions(+), 1 deletion(-)
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/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..2ffb6face111
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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
+# incompatible with packaged pytest version, probably can be removed when updated
+make_check=no
+
+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 2be2c124cd7e..895d3d3e8ddf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,7 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-SQLAlchemy<=1.3.18_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From f36805780cc09cdd11bd93ed4cfc1ac1a72b564e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:42:57 -0400
Subject: [PATCH 09/28] python-sqlparse: remove package.
unused dep, python2
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 895d3d3e8ddf..c2817230d229 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -400,6 +400,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-typing<=3.6.6_2
python-unicorn>=0
From e3e62c6c127f3e1535e1e026f7677a9741e64df5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:46:19 -0400
Subject: [PATCH 10/28] 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 c2817230d229..bbc512060fc6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,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 73e8564fc444df8c0481cc98b81725a1cc1a8280 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:11:31 -0400
Subject: [PATCH 11/28] 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 bbc512060fc6..f99d4d07e106 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,6 +16,7 @@ replaces="
Platinum9-theme<=0.0.0.20170720_3
Pyrex<=0.9.9_5
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From b23f964f078aad808550960dba8f4d406c7bc70e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:06 -0400
Subject: [PATCH 12/28] 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 f99d4d07e106..dd3098b6635c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,7 @@ replaces="
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From 6f26f39d73454363085afb7f63ac993fcd1b7513 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:25 -0400
Subject: [PATCH 13/28] 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 7b3b97d275b6607f7e9091395a480c443c0e716e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:14:10 -0400
Subject: [PATCH 14/28] 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 dd3098b6635c..ed772e9d4b4d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -377,6 +377,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-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
From 2a0f0daf081ed9d8d1ff532cc7b32bf9da0d006f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:18:46 -0400
Subject: [PATCH 15/28] python-service_identity: remove package.
unused dep, python2
---
srcpkgs/python-service_identity/template | 29 -----------------------
srcpkgs/python3-service_identity | 1 -
srcpkgs/python3-service_identity/template | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ed772e9d4b4d..d0b0a9817bb7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -401,6 +401,7 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_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 dbb83a6fb42b8eeb40bd0c77e1cb53a598d4ed45 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:23:24 -0400
Subject: [PATCH 16/28] 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..b69ffefafeaf
--- /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=5
+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 d0b0a9817bb7..4cdf1b415951 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -386,6 +386,7 @@ replaces="
python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ 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 62cd266a368eddaa94887d85e23d8a93fb57a766 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:26:32 -0400
Subject: [PATCH 17/28] python-pyasn1: remove package.
unused dep, py2
---
srcpkgs/python3-pyasn1 | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 4cdf1b415951..05683bf4f38c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -387,6 +387,7 @@ replaces="
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
+ python-pyasn1<=0.4.8_4
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
From fdc36b3fe98fc0e5ad4ab7c3dbbf78b89e26596e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:50:21 -0400
Subject: [PATCH 18/28] python-cryptography: remove package.
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 05683bf4f38c..68bf2ce03751 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
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 52acccd1dfa127fd176fb1d536fd0c9caa8baaae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:53:06 -0400
Subject: [PATCH 19/28] 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 68bf2ce03751..a955e20ad2a9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -366,6 +366,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
From cf2f93ffa227327ea44317cc80a6247fe92551b0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:10:43 -0400
Subject: [PATCH 20/28] python-cffi: remove package.
unused dep, py2
---
srcpkgs/python3-cffi | 1 -
.../{python-cffi => python3-cffi}/template | 25 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (62%)
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 62%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 642492e9cd94..7881ba70114b 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
wrksrc="cffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
-depends="python-pycparser"
+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 Python2"
+short_desc="C foreign function interface for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://cffi.readthedocs.io/"
@@ -25,19 +25,10 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+ PYTHONPATH="$(cd build/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
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 a955e20ad2a9..bfba37498fe5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -347,6 +347,7 @@ replaces="
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
+ python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-contextlib2<=0.6.0.post1_1
From a05f764f749f32029645e20fc7b3bfe3fdd9daf4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 21/28] 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 bfba37498fe5..5d40314e45d3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -391,6 +391,7 @@ replaces="
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
python-pyasn1<=0.4.8_4
+ 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 74317ba86ecd441a36a814b932b40ad339686ad1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 22/28] python-ply: remove package.
unused dep, py2
---
srcpkgs/python3-ply | 1 -
srcpkgs/{python-ply => python3-ply}/template | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 5d40314e45d3..3a0fc07d5c06 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -387,6 +387,7 @@ replaces="
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_6
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
From a69d705b57a2be4be869b2971904c62a31ed61de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 23/28] 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 3a0fc07d5c06..cda3e149e17e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,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-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
From 0950b46ef9264ae0b0cdf4ad6f0f084b829dac14 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 24/28] python-incremental: remove package.
unused dep, py2
---
srcpkgs/python3-incremental | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 cda3e149e17e..c390de8cef22 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -368,6 +368,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
From ac73b2650756230c5dcd875d6682a6b0f7792477 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 25/28] python-automat: remove package.
unused dep, py2
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 5 ++--
4 files changed, 41 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 c390de8cef22..cadc71e68707 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,8 +35,8 @@ replaces="
bgc<=1.0.1_1
bokken<=1.8_3
bomi<=0.9.11_17
- buildbot<=0.8.14_5
buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -338,11 +338,12 @@ replaces="
python-Pillow<=6.2.2_3
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
- python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-SecretStorage<=2.3.1_4
python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-automat<=20.2.0_4
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
From cb280059ee0b8b9c7395b03174f4610bc196c9bd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 26/28] python-hyperlink: remove package.
unused dep, py2
---
srcpkgs/python3-hyperlink | 1 -
srcpkgs/python3-hyperlink/template | 19 +++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-hyperlink
create mode 100644 srcpkgs/python3-hyperlink/template
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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 cadc71e68707..189c08d5c423 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -367,6 +367,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-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
From 83144ef912c59f97c0659eac9ba2b4b25b7f884e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 27/28] 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 189c08d5c423..e624a9b54603 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -369,6 +369,7 @@ replaces="
python-gobject<=3.36.1_2
python-hyperlink<=21.0.0_2
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
From d37d1c7e15eab0e590920a020ed81e48c01cac34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 28/28] python-PyHamcrest: remove package.
unused dep, py2
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index e624a9b54603..33df6d314516 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -336,6 +336,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SQLAlchemy<=1.3.18_4
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (14 preceding siblings ...)
2022-10-06 10:59 ` classabbyamp
@ 2022-10-06 11:38 ` classabbyamp
2022-10-06 11:52 ` classabbyamp
` (16 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-10-06 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1923 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-pbr
- python-Twisted
- Twisted (transitional dummy package)
- python-openssl
- python-service_identity
- python-pyasn1-modules
- python-pyasn1
- python-cryptography
- python-enum34
- python-ipaddress
- python-cffi
- python-pycparser
- python-ply
- python-constantly
- python-incremental
- python-automat
- python-attrs
- python-hyperlink
- python-idna
- python-PyHamcrest
- python-six
- python-zope.interface
- 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: 92965 bytes --]
From 313a5808364e7b3c10e7d1058f2ae7012b41d073 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:12:26 -0400
Subject: [PATCH 01/33] 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 03bef6a42b2f..8d7bc0b7e4e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -34,6 +34,7 @@ replaces="
bgc<=1.0.1_1
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 bc76468ca61aee7c057b6726cded4ffd13be35aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:13:06 -0400
Subject: [PATCH 02/33] 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 8d7bc0b7e4e6..11afb3fcba84 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,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 e99d5951e247e97554f2651499f9d301a4a5ff84 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:04:26 -0400
Subject: [PATCH 03/33] python-Jinja2: remove package.
unused dependency, Python 2.
---
srcpkgs/python-Jinja2/update | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 srcpkgs/python-Jinja2/update
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 11afb3fcba84..4e24277f3f00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -331,6 +331,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-PyQt4<=4.12.1_4
From 1a21817114d44d0b862d868d504c8394549348d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:06:51 -0400
Subject: [PATCH 04/33] 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 4e24277f3f00..607945b8db9c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
From 6a43fe4f8b8165943541aec8f8d791fd97e95b4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:28:37 -0400
Subject: [PATCH 05/33] python-dateutil: remove package.
unused dependency, python 2
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 607945b8db9c..5a884b39a1c3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,7 @@ replaces="
python-coverage<=5.0.3_3
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 96ecebe19e55ad802e35d7f2760a39b39e568eca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:55:43 -0400
Subject: [PATCH 06/33] 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 5a884b39a1c3..28fce61dc2a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -397,6 +397,7 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
python-typing<=3.6.6_2
python-unicorn>=0
@@ -426,6 +427,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 fb8a8c564abeebda590eca0373c920f487255fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:17:57 -0400
Subject: [PATCH 07/33] 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 28fce61dc2a0..2be2c124cd7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -399,6 +399,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-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -428,6 +429,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 18f0645ca0ef162cd43eefa3a78bf8dfb46f3c40 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:30:32 -0400
Subject: [PATCH 08/33] python-SQLAlchemy: remove package.
unused dep, python2.
---
srcpkgs/python3-SQLAlchemy | 1 -
srcpkgs/python3-SQLAlchemy/template | 21 +++++++++++++++++++
.../update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 insertions(+), 1 deletion(-)
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/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..2ffb6face111
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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
+# incompatible with packaged pytest version, probably can be removed when updated
+make_check=no
+
+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 2be2c124cd7e..895d3d3e8ddf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,7 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-SQLAlchemy<=1.3.18_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From f36805780cc09cdd11bd93ed4cfc1ac1a72b564e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:42:57 -0400
Subject: [PATCH 09/33] python-sqlparse: remove package.
unused dep, python2
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 895d3d3e8ddf..c2817230d229 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -400,6 +400,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-typing<=3.6.6_2
python-unicorn>=0
From e3e62c6c127f3e1535e1e026f7677a9741e64df5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:46:19 -0400
Subject: [PATCH 10/33] 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 c2817230d229..bbc512060fc6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,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 4c44ec6ec7da7c58d7fbce8f6e187df2a1fba098 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:20:02 -0400
Subject: [PATCH 11/33] python-pbr: remove package.
python2, unused dep
---
srcpkgs/python-pbr/template | 27 ---------------------------
srcpkgs/python3-pbr | 1 -
srcpkgs/python3-pbr/template | 18 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
delete mode 120000 srcpkgs/python3-pbr
create mode 100644 srcpkgs/python3-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 0a3c0dd98037..000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=1
-wrksrc="pbr-${version}"
-build_style=python-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-python3-pbr_package() {
- depends="python3"
- pycompile_module="pbr"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pbr:pbr:/usr/bin/pbr3"
- pkg_install() {
- vmove usr/bin/pbr3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pbr b/srcpkgs/python3-pbr
deleted file mode 120000
index 7d5e74920c1c..000000000000
--- a/srcpkgs/python3-pbr
+++ /dev/null
@@ -1 +0,0 @@
-python-pbr
\ No newline at end of file
diff --git a/srcpkgs/python3-pbr/template b/srcpkgs/python3-pbr/template
new file mode 100644
index 000000000000..c3dd410a5f45
--- /dev/null
+++ b/srcpkgs/python3-pbr/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pbr'
+pkgname=python3-pbr
+version=5.6.0
+revision=1
+wrksrc="pbr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 build reasonableness"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://docs.openstack.org/developer/pbr/"
+distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
+checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
+
+post_install() {
+ ln -s /usr/bin/pbr ${DESTDIR}/usr/bin/pbr3
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bbc512060fc6..d61dae4fe377 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -378,6 +378,7 @@ replaces="
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_1
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
From 788c0ad52aa81ef1c74e7452e84173e334945956 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:11:31 -0400
Subject: [PATCH 12/33] 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 d61dae4fe377..e5218209aa18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,6 +16,7 @@ replaces="
Platinum9-theme<=0.0.0.20170720_3
Pyrex<=0.9.9_5
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From bfb76e696bc70b71e19998ef9543bd13d3d3b214 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:06 -0400
Subject: [PATCH 13/33] 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 e5218209aa18..0ef9fa8021c8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,7 @@ replaces="
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From 8359f223a4aa44312a9a8c220bd4b99a10003e59 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:25 -0400
Subject: [PATCH 14/33] 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 16be2ce332626a4a558bb6c99e6e13d2a7af95d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:14:10 -0400
Subject: [PATCH 15/33] 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 0ef9fa8021c8..15fa9ceaaaca 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -377,6 +377,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-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
From e0295f1260a0f388789c120707ffb5a7f8ad57ea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:18:46 -0400
Subject: [PATCH 16/33] python-service_identity: remove package.
unused dep, python2
---
srcpkgs/python-service_identity/template | 29 -----------------------
srcpkgs/python3-service_identity | 1 -
srcpkgs/python3-service_identity/template | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 15fa9ceaaaca..25bdab70bcd5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -402,6 +402,7 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_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 cefe505fa7f05f56ea819507f858d2caf7a8ccbc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:23:24 -0400
Subject: [PATCH 17/33] 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..b69ffefafeaf
--- /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=5
+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 25bdab70bcd5..fcbce36b4061 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -387,6 +387,7 @@ replaces="
python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ 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 9fea7e4aef0d52497bbcfea64584cfbaa952c0d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:26:32 -0400
Subject: [PATCH 18/33] python-pyasn1: remove package.
unused dep, py2
---
srcpkgs/python3-pyasn1 | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 fcbce36b4061..acd9e9c629d4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -388,6 +388,7 @@ replaces="
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
+ python-pyasn1<=0.4.8_4
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
From d21feb991e10b553c6a3cd275923a75c0d6499cc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:50:21 -0400
Subject: [PATCH 19/33] python-cryptography: remove package.
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 acd9e9c629d4..583f41de6e27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
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 a8a265a1ee563e089b8892c88fb3d804576d8e1f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:14:53 -0400
Subject: [PATCH 20/33] python-enum34: remove package.
python2, unused dep
---
srcpkgs/python-enum34/template | 22 ----------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index 55894323fbbe..000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-wrksrc="enum34-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 583f41de6e27..22cdb7d2f3a7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -359,6 +359,7 @@ replaces="
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
From c0e2916bcaec8e568524421614abc642546680d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:53:06 -0400
Subject: [PATCH 21/33] 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 22cdb7d2f3a7..4a73cbea409d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -367,6 +367,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
From 7d8fa8b4997bb5b717c82f53333203dc97c6c9c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:10:43 -0400
Subject: [PATCH 22/33] python-cffi: remove package.
unused dep, py2
---
srcpkgs/python3-cffi | 1 -
.../{python-cffi => python3-cffi}/template | 25 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (62%)
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 62%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 642492e9cd94..7881ba70114b 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
wrksrc="cffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
-depends="python-pycparser"
+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 Python2"
+short_desc="C foreign function interface for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://cffi.readthedocs.io/"
@@ -25,19 +25,10 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+ PYTHONPATH="$(cd build/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
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 4a73cbea409d..11032c61b0db 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -347,6 +347,7 @@ replaces="
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
+ python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-contextlib2<=0.6.0.post1_1
From 7a7c36c3cdf019ab04f19fe9cd3204aad778406c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 23/33] 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 11032c61b0db..0b6f3192612a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -393,6 +393,7 @@ replaces="
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
python-pyasn1<=0.4.8_4
+ 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 65bd2e26f2237c6a538f5c60df582b954e888768 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 24/33] python-ply: remove package.
unused dep, py2
---
srcpkgs/python3-ply | 1 -
srcpkgs/{python-ply => python3-ply}/template | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 0b6f3192612a..4eebf781e7b5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -389,6 +389,7 @@ replaces="
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_6
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
From b1eba77755be37825dfc318e2f487e5a528b0e9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 25/33] 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 4eebf781e7b5..8bd422111c13 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,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-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
From c78af76b70333fc57ccbe5ad7527466f5da8ec23 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 26/33] python-incremental: remove package.
unused dep, py2
---
srcpkgs/python3-incremental | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 8bd422111c13..6a0d98b50e16 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -369,6 +369,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
From fefb8d9fff158f4685fbb9d87e5a6109e390addb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 27/33] python-automat: remove package.
unused dep, py2
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 5 ++--
4 files changed, 41 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 6a0d98b50e16..ee9503baa982 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,8 +35,8 @@ replaces="
bgc<=1.0.1_1
bokken<=1.8_3
bomi<=0.9.11_17
- buildbot<=0.8.14_5
buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -338,11 +338,12 @@ replaces="
python-Pillow<=6.2.2_3
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
- python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-SecretStorage<=2.3.1_4
python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-automat<=20.2.0_4
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
From c9d3f797784d01adfcfbed6b1e7f2fc9d83d6c3d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:11:27 -0400
Subject: [PATCH 28/33] python-attrs: remove package.
python2, unused dep
---
srcpkgs/python-attrs/template | 32 -------------------------------
srcpkgs/python3-attrs | 1 -
srcpkgs/python3-attrs/template | 19 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
delete mode 120000 srcpkgs/python3-attrs
create mode 100644 srcpkgs/python3-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ccb08e6678f1..000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=2
-wrksrc="attrs-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-do_check() {
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-attrs_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-attrs b/srcpkgs/python3-attrs
deleted file mode 120000
index f6d04198f695..000000000000
--- a/srcpkgs/python3-attrs
+++ /dev/null
@@ -1 +0,0 @@
-python-attrs
\ No newline at end of file
diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template
new file mode 100644
index 000000000000..c01979580097
--- /dev/null
+++ b/srcpkgs/python3-attrs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-attrs'
+pkgname=python3-attrs
+version=21.2.0
+revision=2
+wrksrc="attrs-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
+short_desc="Attributes without boilerplate (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://attrs.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
+checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ee9503baa982..9ba72d325f11 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,7 @@ replaces="
python-SecretStorage<=2.3.1_4
python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_2
python-audit<=2.8.5_2
python-automat<=20.2.0_4
python-backports.configparser<=3.5.0_2
From 70622a0e9997484a5c717901eeacd78b1924db70 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 29/33] python-hyperlink: remove package.
unused dep, py2
---
srcpkgs/python3-hyperlink | 1 -
srcpkgs/python3-hyperlink/template | 19 +++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-hyperlink
create mode 100644 srcpkgs/python3-hyperlink/template
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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 9ba72d325f11..4f0a42962516 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -369,6 +369,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-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
From a60a21c0d738dcb59dd8dd737abbf159dc22a98b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 30/33] 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 4f0a42962516..75b5bdc37865 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -371,6 +371,7 @@ replaces="
python-gobject<=3.36.1_2
python-hyperlink<=21.0.0_2
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
From ce562efbf9eb483c0418c17d11f7dcccc76928dc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 31/33] python-PyHamcrest: remove package.
unused dep, py2
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index 75b5bdc37865..adc4435cb341 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -336,6 +336,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SQLAlchemy<=1.3.18_4
From a9e78ab30886957134851c729334d5f1ecb9184a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:24:14 -0400
Subject: [PATCH 32/33] python-six: remove package.
python 2, unused dep
---
srcpkgs/python3-six | 1 -
srcpkgs/{python-six => python3-six}/template | 25 +++++---------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-six
rename srcpkgs/{python-six => python3-six}/template (51%)
diff --git a/srcpkgs/python3-six b/srcpkgs/python3-six
deleted file mode 120000
index 70747adc77ed..000000000000
--- a/srcpkgs/python3-six
+++ /dev/null
@@ -1 +0,0 @@
-python-six
\ No newline at end of file
diff --git a/srcpkgs/python-six/template b/srcpkgs/python3-six/template
similarity index 51%
rename from srcpkgs/python-six/template
rename to srcpkgs/python3-six/template
index bae3a78bd13a..a3131b30966f 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,13 +1,13 @@
-# Template file for 'python-six'
-pkgname=python-six
+# Template file for 'python3-six'
+pkgname=python3-six
version=1.16.0
revision=2
wrksrc="six-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
+short_desc="Python 2 and 3 compatibility utilities (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/benjaminp/six"
@@ -18,16 +18,3 @@ checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
post_install() {
vlicense LICENSE
}
-
-do_check() {
- python3 -m pytest
-}
-
-python3-six_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 adc4435cb341..5767cf7ff799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -418,6 +418,7 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-service_identity<=18.1.0_5
+ python-six<=1.16.0_2
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
From d5abafe090d42fe01244edd5e0ea476a2d79085c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:30:05 -0400
Subject: [PATCH 33/33] python-zope.interface: remove package.
python2, unused dep
---
srcpkgs/python3-zope.interface | 1 -
.../template | 27 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-zope.interface
rename srcpkgs/{python-zope.interface => python3-zope.interface}/template (50%)
diff --git a/srcpkgs/python3-zope.interface b/srcpkgs/python3-zope.interface
deleted file mode 120000
index 48f8d4c160ef..000000000000
--- a/srcpkgs/python3-zope.interface
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.interface
\ No newline at end of file
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python3-zope.interface/template
similarity index 50%
rename from srcpkgs/python-zope.interface/template
rename to srcpkgs/python3-zope.interface/template
index 94a22e87902e..99df64f00e3e 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python3-zope.interface/template
@@ -1,13 +1,13 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
+# Template file for 'python3-zope.interface'
+pkgname=python3-zope.interface
version=5.4.0
revision=2
wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Zope interfaces for Python3"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="ZPL-2.1"
homepage="https://github.com/zopefoundation/zope.interface"
@@ -19,17 +19,6 @@ make_check=no
post_install() {
# zope.interface provides the zope namespace
- for py_sitelib in $py2_sitelib $py3_sitelib; do
- vinstall src/zope/__init__.py 644 ${py_sitelib}/zope
- done
+ vinstall src/zope/__init__.py 644 ${py3_sitelib}/zope
vlicense LICENSE.txt LICENSE
}
-
-python3-zope.interface_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5767cf7ff799..00f85d799e73 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -432,6 +432,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.4.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (15 preceding siblings ...)
2022-10-06 11:38 ` classabbyamp
@ 2022-10-06 11:52 ` classabbyamp
2023-01-05 1:59 ` github-actions
` (15 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2022-10-06 11:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1923 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-pbr
- python-Twisted
- Twisted (transitional dummy package)
- python-openssl
- python-service_identity
- python-pyasn1-modules
- python-pyasn1
- python-cryptography
- python-enum34
- python-ipaddress
- python-cffi
- python-pycparser
- python-ply
- python-constantly
- python-incremental
- python-automat
- python-attrs
- python-hyperlink
- python-idna
- python-PyHamcrest
- python-six
- python-zope.interface
- 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: 93009 bytes --]
From 313a5808364e7b3c10e7d1058f2ae7012b41d073 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:12:26 -0400
Subject: [PATCH 01/33] 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 03bef6a42b2f..8d7bc0b7e4e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -34,6 +34,7 @@ replaces="
bgc<=1.0.1_1
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 bc76468ca61aee7c057b6726cded4ffd13be35aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:13:06 -0400
Subject: [PATCH 02/33] 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 8d7bc0b7e4e6..11afb3fcba84 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,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 e99d5951e247e97554f2651499f9d301a4a5ff84 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:04:26 -0400
Subject: [PATCH 03/33] python-Jinja2: remove package.
unused dependency, Python 2.
---
srcpkgs/python-Jinja2/update | 1 -
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 srcpkgs/python-Jinja2/update
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 11afb3fcba84..4e24277f3f00 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -331,6 +331,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-PyQt4<=4.12.1_4
From 1a21817114d44d0b862d868d504c8394549348d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:06:51 -0400
Subject: [PATCH 04/33] 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 4e24277f3f00..607945b8db9c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -333,6 +333,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
From 6a43fe4f8b8165943541aec8f8d791fd97e95b4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:28:37 -0400
Subject: [PATCH 05/33] python-dateutil: remove package.
unused dependency, python 2
python3-dateutil: fix tests
---
.../patches/setuptools_scm.patch | 28 -----------
srcpkgs/python-dateutil/template | 30 ------------
srcpkgs/python3-dateutil | 1 -
.../python3-dateutil/patches/fix-tests.patch | 46 +++++++++++++++++++
srcpkgs/python3-dateutil/template | 19 ++++++++
srcpkgs/removed-packages/template | 1 +
6 files changed, 66 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/patches/fix-tests.patch
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/patches/fix-tests.patch b/srcpkgs/python3-dateutil/patches/fix-tests.patch
new file mode 100644
index 000000000000..ddf53e0ff13b
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/fix-tests.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ dateutil/test/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@
+
+ import sys
+ import pytest
++import warnings
+
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+ from dateutil.parser._parser import _timelex, _tzparser
+ from dateutil.parser._parser import _parsetz
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _tzparser()
+- assert len(recorder) == 0
+
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _timelex('2014-03-03')
+
+- assert len(recorder) == 0
+-
+- with pytest.warns(None) as recorder:
++ with warnings.catch_warnings():
++ warnings.simplefilter("error")
+ _parsetz('+05:00')
+- assert len(recorder) == 0
+
+
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 000000000000..d8d98ad6418f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=1
+wrksrc="${pkgname/3/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="$depends python3-pytest python3-pytest-cov python3-hypothesis python3-freezegun"
+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 607945b8db9c..5a884b39a1c3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,7 @@ replaces="
python-coverage<=5.0.3_3
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 96ecebe19e55ad802e35d7f2760a39b39e568eca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 21:55:43 -0400
Subject: [PATCH 06/33] 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 5a884b39a1c3..28fce61dc2a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -397,6 +397,7 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
python-typing<=3.6.6_2
python-unicorn>=0
@@ -426,6 +427,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 fb8a8c564abeebda590eca0373c920f487255fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:17:57 -0400
Subject: [PATCH 07/33] 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 28fce61dc2a0..2be2c124cd7e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -399,6 +399,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-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -428,6 +429,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 18f0645ca0ef162cd43eefa3a78bf8dfb46f3c40 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:30:32 -0400
Subject: [PATCH 08/33] python-SQLAlchemy: remove package.
unused dep, python2.
---
srcpkgs/python3-SQLAlchemy | 1 -
srcpkgs/python3-SQLAlchemy/template | 21 +++++++++++++++++++
.../update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 insertions(+), 1 deletion(-)
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/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..2ffb6face111
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-SQLAlchemy'
+pkgname=python3-SQLAlchemy
+version=1.3.18
+revision=4
+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
+# incompatible with packaged pytest version, probably can be removed when updated
+make_check=no
+
+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 2be2c124cd7e..895d3d3e8ddf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -338,6 +338,7 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-SQLAlchemy<=1.3.18_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From f36805780cc09cdd11bd93ed4cfc1ac1a72b564e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:42:57 -0400
Subject: [PATCH 09/33] python-sqlparse: remove package.
unused dep, python2
python3-sqlparse: fix tests
---
srcpkgs/python-sqlparse/template | 32 ----------------
srcpkgs/python3-sqlparse | 1 -
.../python3-sqlparse/patches/fix_tests.patch | 38 +++++++++++++++++++
srcpkgs/python3-sqlparse/template | 21 ++++++++++
srcpkgs/removed-packages/template | 1 +
5 files changed, 60 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
delete mode 120000 srcpkgs/python3-sqlparse
create mode 100644 srcpkgs/python3-sqlparse/patches/fix_tests.patch
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/patches/fix_tests.patch b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
new file mode 100644
index 000000000000..4ee6f0b45b63
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/patches/fix_tests.patch
@@ -0,0 +1,38 @@
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -78,7 +78,7 @@
+ def test_encoding_utf8_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_utf8.sql')
+ expected = load_file('encoding_utf8.sql', 'utf-8')
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main([path])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -96,7 +96,7 @@
+ def test_encoding_gbk_stdout(filepath, load_file, capfd):
+ path = filepath('encoding_gbk.sql')
+ expected = load_file('encoding_gbk.sql', 'gbk')
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main([path, '--encoding', 'gbk'])
+ out, _ = capfd.readouterr()
+ assert out == expected
+@@ -117,7 +117,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as f:
+ sys.stdin = f
+- sys.stdout.encoding = 'utf-8'
++ sys.stdout.reconfigure(encoding='utf-8')
+ sqlparse.cli.main(['-'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
+@@ -130,7 +130,7 @@
+ old_stdin = sys.stdin
+ with open(path, 'r') as stream:
+ sys.stdin = stream
+- sys.stdout.encoding = 'gbk'
++ sys.stdout.reconfigure(encoding='gbk')
+ sqlparse.cli.main(['-', '--encoding', 'gbk'])
+ sys.stdin = old_stdin
+ out, _ = capfd.readouterr()
diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template
new file mode 100644
index 000000000000..afb8e33ed9a4
--- /dev/null
+++ b/srcpkgs/python3-sqlparse/template
@@ -0,0 +1,21 @@
+# 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"
+checkdepends="python3-pytest"
+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 895d3d3e8ddf..c2817230d229 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -400,6 +400,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-typing<=3.6.6_2
python-unicorn>=0
From e3e62c6c127f3e1535e1e026f7677a9741e64df5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 22:46:19 -0400
Subject: [PATCH 10/33] 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 c2817230d229..bbc512060fc6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,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 71bc39b95f085656f4ef64cd64695fb41977cc97 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:20:02 -0400
Subject: [PATCH 11/33] python-pbr: remove package.
python2, unused dep
---
srcpkgs/python-pbr/template | 27 ---------------------------
srcpkgs/python3-pbr | 1 -
srcpkgs/python3-pbr/template | 20 ++++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
delete mode 120000 srcpkgs/python3-pbr
create mode 100644 srcpkgs/python3-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 0a3c0dd98037..000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=1
-wrksrc="pbr-${version}"
-build_style=python-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-python3-pbr_package() {
- depends="python3"
- pycompile_module="pbr"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pbr:pbr:/usr/bin/pbr3"
- pkg_install() {
- vmove usr/bin/pbr3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pbr b/srcpkgs/python3-pbr
deleted file mode 120000
index 7d5e74920c1c..000000000000
--- a/srcpkgs/python3-pbr
+++ /dev/null
@@ -1 +0,0 @@
-python-pbr
\ No newline at end of file
diff --git a/srcpkgs/python3-pbr/template b/srcpkgs/python3-pbr/template
new file mode 100644
index 000000000000..8563710d85c9
--- /dev/null
+++ b/srcpkgs/python3-pbr/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pbr'
+pkgname=python3-pbr
+version=5.6.0
+revision=1
+wrksrc="pbr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 build reasonableness"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://docs.openstack.org/developer/pbr/"
+distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
+checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
+# unpackaged checkdepends
+make_check=no
+
+post_install() {
+ ln -s /usr/bin/pbr ${DESTDIR}/usr/bin/pbr3
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bbc512060fc6..d61dae4fe377 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -378,6 +378,7 @@ replaces="
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_1
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
From 554685a0d11376939349638b9ecac054093a20d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:11:31 -0400
Subject: [PATCH 12/33] 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 d61dae4fe377..e5218209aa18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,6 +16,7 @@ replaces="
Platinum9-theme<=0.0.0.20170720_3
Pyrex<=0.9.9_5
SMC<=1.9_9
+ Twisted<=17.9.0_2
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
From 642b62eb9895fa2488e1965aed8ef4a294f41ba9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:06 -0400
Subject: [PATCH 13/33] 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 e5218209aa18..0ef9fa8021c8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -340,6 +340,7 @@ replaces="
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
python-backports.configparser<=3.5.0_2
From 902f02f9e14bc6f0992227f8f86da667b3773a2d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:12:25 -0400
Subject: [PATCH 14/33] 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 f0721710adbe80ec34b3cb14b32ff270bfc4163d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:14:10 -0400
Subject: [PATCH 15/33] 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 0ef9fa8021c8..15fa9ceaaaca 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -377,6 +377,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-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
From 3bfd1dff72cbaf9bee797189ea9fbb9d72829d79 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:18:46 -0400
Subject: [PATCH 16/33] python-service_identity: remove package.
unused dep, python2
---
srcpkgs/python-service_identity/template | 29 -----------------------
srcpkgs/python3-service_identity | 1 -
srcpkgs/python3-service_identity/template | 21 ++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 22 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..cccd6a07d487
--- /dev/null
+++ b/srcpkgs/python3-service_identity/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-service_identity'
+pkgname=python3-service_identity
+version=18.1.0
+revision=5
+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/"
+changelog="https://github.com/pyca/service-identity"
+distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
+checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
+# does not include tests in pypi distfile
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 15fa9ceaaaca..25bdab70bcd5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -402,6 +402,7 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_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 f087b251dadaa800b1ddc87ededc93ccd9d6835e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:23:24 -0400
Subject: [PATCH 17/33] 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..b69ffefafeaf
--- /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=5
+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 25bdab70bcd5..fcbce36b4061 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -387,6 +387,7 @@ replaces="
python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ 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 18b1796692f9d90c0432d37212d597ebd2e8cf4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:26:32 -0400
Subject: [PATCH 18/33] python-pyasn1: remove package.
unused dep, py2
---
srcpkgs/python3-pyasn1 | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyasn1
rename srcpkgs/{python-pyasn1 => python3-pyasn1}/template (54%)
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 54%
rename from srcpkgs/python-pyasn1/template
rename to srcpkgs/python3-pyasn1/template
index 733149d58448..919df33907f5 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
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 fcbce36b4061..acd9e9c629d4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -388,6 +388,7 @@ replaces="
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
+ python-pyasn1<=0.4.8_4
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
From f0e1afe84a0bd7359dfd9c4dd3ac7ca48773b232 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:50:21 -0400
Subject: [PATCH 19/33] python-cryptography: remove package.
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 acd9e9c629d4..583f41de6e27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -352,6 +352,7 @@ replaces="
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
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 9a8a1c7bf9ca5e72d03e6b284e2ea994ba268498 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:14:53 -0400
Subject: [PATCH 20/33] python-enum34: remove package.
python2, unused dep
---
srcpkgs/python-enum34/template | 22 ----------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index 55894323fbbe..000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-wrksrc="enum34-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 583f41de6e27..22cdb7d2f3a7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -359,6 +359,7 @@ replaces="
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
From a44d82fce49bef407845b5ee709155266168d85c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 16 Aug 2022 23:53:06 -0400
Subject: [PATCH 21/33] 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 22cdb7d2f3a7..4a73cbea409d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -367,6 +367,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
From 9b097b6b84acaffe65d268eb93e101024e895b48 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:10:43 -0400
Subject: [PATCH 22/33] python-cffi: remove package.
unused dep, py2
---
srcpkgs/python3-cffi | 1 -
.../{python-cffi => python3-cffi}/template | 25 ++++++-------------
srcpkgs/{python-cffi => python3-cffi}/update | 0
srcpkgs/removed-packages/template | 1 +
4 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-cffi
rename srcpkgs/{python-cffi => python3-cffi}/template (62%)
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 62%
rename from srcpkgs/python-cffi/template
rename to srcpkgs/python3-cffi/template
index 642492e9cd94..7881ba70114b 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
wrksrc="cffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools libffi-devel"
-makedepends="python-devel python3-devel libffi-devel"
-depends="python-pycparser"
+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 Python2"
+short_desc="C foreign function interface for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://cffi.readthedocs.io/"
@@ -25,19 +25,10 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+ PYTHONPATH="$(cd build/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
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 4a73cbea409d..11032c61b0db 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -347,6 +347,7 @@ replaces="
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
+ python-cffi<=1.15.1_1
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-contextlib2<=0.6.0.post1_1
From 4e9b09534868668c4b2c78a3146d604301a47d05 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:15:09 -0400
Subject: [PATCH 23/33] 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..6c17ce1394df
--- /dev/null
+++ b/srcpkgs/python3-pycparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pycparser'
+pkgname=python3-pycparser
+version=2.20
+revision=2
+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 11032c61b0db..0b6f3192612a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -393,6 +393,7 @@ replaces="
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
python-pyasn1<=0.4.8_4
+ 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 30c7d5444a6a31a86ae38f604a9e0ab27f8a3a4d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:17:41 -0400
Subject: [PATCH 24/33] python-ply: remove package.
unused dep, py2
---
srcpkgs/python3-ply | 1 -
srcpkgs/{python-ply => python3-ply}/template | 21 ++++++--------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-ply
rename srcpkgs/{python-ply => python3-ply}/template (52%)
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 52%
rename from srcpkgs/python-ply/template
rename to srcpkgs/python3-ply/template
index f91150588c84..b326405a9709 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
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 0b6f3192612a..4eebf781e7b5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -389,6 +389,7 @@ replaces="
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_6
python-pretend<=1.0.9_5
python-py<=1.10.0_1
python-pyasn1-modules<=0.2.8_5
From 1b7e09e6115ae997cbac441d704079a587aff6c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:22:56 -0400
Subject: [PATCH 25/33] 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..8b3d1fd92cf1
--- /dev/null
+++ b/srcpkgs/python3-constantly/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-constantly'
+pkgname=python3-constantly
+version=15.1.0
+revision=6
+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 4eebf781e7b5..8bd422111c13 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -350,6 +350,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-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
From 2d1c4a2580cd46f10dd126dff381cfa346597ee1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:26:26 -0400
Subject: [PATCH 26/33] python-incremental: remove package.
unused dep, py2
---
srcpkgs/python3-incremental | 1 -
.../template | 21 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-incremental
rename srcpkgs/{python-incremental => python3-incremental}/template (59%)
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 59%
rename from srcpkgs/python-incremental/template
rename to srcpkgs/python3-incremental/template
index 900b83f5f774..8b6afdb8efcb 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
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 8bd422111c13..6a0d98b50e16 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -369,6 +369,7 @@ replaces="
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
From 63523e5e4049522d97be0dc1b97bda1876820e79 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:42:15 -0400
Subject: [PATCH 27/33] python-automat: remove package.
unused dep, py2
python3-automat: disable tests in CI
---
srcpkgs/python-automat/template | 42 -------------------------------
srcpkgs/python3-automat | 1 -
srcpkgs/python3-automat/template | 38 ++++++++++++++++++++++++++++
srcpkgs/removed-packages/template | 5 ++--
4 files changed, 41 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/python-automat/template
delete mode 120000 srcpkgs/python3-automat
create mode 100644 srcpkgs/python3-automat/template
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index 3487b14abce8..000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=20.2.0
-revision=4
-wrksrc="Automat-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-do_check() {
- python3 setup.py test
-}
-
-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
- }
-}
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/python3-automat/template b/srcpkgs/python3-automat/template
new file mode 100644
index 000000000000..56330a4a8928
--- /dev/null
+++ b/srcpkgs/python3-automat/template
@@ -0,0 +1,38 @@
+# Template file for 'python3-automat'
+pkgname=python3-automat
+version=20.2.0
+revision=5
+wrksrc="Automat-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-attrs python3-six"
+short_desc="Finite-state machines in Python (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/glyph/Automat"
+distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
+checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
+# if python3-Twisted is built at the same time, it causes a cyclic dependency, tests pass locally
+make_check=ci-skip
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+ checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+fi
+
+pre_build() {
+ sed -i setup.py \
+ -e '/print(/d' \
+ -e '/setup_requires=/,+3d' \
+ -e "s/use_scm_version=True/version='${version}'/"
+}
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ 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 6a0d98b50e16..ee9503baa982 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,8 +35,8 @@ replaces="
bgc<=1.0.1_1
bokken<=1.8_3
bomi<=0.9.11_17
- buildbot<=0.8.14_5
buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -338,11 +338,12 @@ replaces="
python-Pillow<=6.2.2_3
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
- python-SecretStorage<=2.3.1_4
python-SQLAlchemy<=1.3.18_4
+ python-SecretStorage<=2.3.1_4
python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-automat<=20.2.0_4
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
From 27accb8f1679822b11045ff62ab20aa3d0aa3c51 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:11:27 -0400
Subject: [PATCH 28/33] python-attrs: remove package.
python2, unused dep
---
srcpkgs/python-attrs/template | 32 -------------------------------
srcpkgs/python3-attrs | 1 -
srcpkgs/python3-attrs/template | 19 ++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
4 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
delete mode 120000 srcpkgs/python3-attrs
create mode 100644 srcpkgs/python3-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ccb08e6678f1..000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=2
-wrksrc="attrs-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-do_check() {
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-attrs_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-attrs b/srcpkgs/python3-attrs
deleted file mode 120000
index f6d04198f695..000000000000
--- a/srcpkgs/python3-attrs
+++ /dev/null
@@ -1 +0,0 @@
-python-attrs
\ No newline at end of file
diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template
new file mode 100644
index 000000000000..c01979580097
--- /dev/null
+++ b/srcpkgs/python3-attrs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-attrs'
+pkgname=python3-attrs
+version=21.2.0
+revision=2
+wrksrc="attrs-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
+short_desc="Attributes without boilerplate (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://attrs.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
+checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ee9503baa982..9ba72d325f11 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -342,6 +342,7 @@ replaces="
python-SecretStorage<=2.3.1_4
python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_2
python-audit<=2.8.5_2
python-automat<=20.2.0_4
python-backports.configparser<=3.5.0_2
From 89bd68da7d04aee0d55efcb38a7f2610e78d982b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:45:28 -0400
Subject: [PATCH 29/33] python-hyperlink: remove package.
unused dep, py2
---
srcpkgs/python3-hyperlink | 1 -
srcpkgs/python3-hyperlink/template | 19 +++++++++++++++++++
srcpkgs/removed-packages/template | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-hyperlink
create mode 100644 srcpkgs/python3-hyperlink/template
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..009eeec1096d
--- /dev/null
+++ b/srcpkgs/python3-hyperlink/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hyperlink'
+pkgname=python3-hyperlink
+version=21.0.0
+revision=2
+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 9ba72d325f11..4f0a42962516 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -369,6 +369,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-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
From b2c05bf3c2b475c4af3018425736d3ed87228d82 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:47:04 -0400
Subject: [PATCH 30/33] 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 4f0a42962516..75b5bdc37865 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -371,6 +371,7 @@ replaces="
python-gobject<=3.36.1_2
python-hyperlink<=21.0.0_2
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
python-incremental<=21.3.0_1
python-ipaddress<=1.0.23_2
From 2adb46be643d56bd8408685a025ec2e87f3ebc45 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 17 Aug 2022 00:50:08 -0400
Subject: [PATCH 31/33] python-PyHamcrest: remove package.
unused dep, py2
python3-PyHamcrest: disable tests
---
srcpkgs/python3-PyHamcrest | 1 -
.../template | 28 +++++++------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
rename srcpkgs/{python-PyHamcrest => python3-PyHamcrest}/template (50%)
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/python-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
similarity index 50%
rename from srcpkgs/python-PyHamcrest/template
rename to srcpkgs/python3-PyHamcrest/template
index 34b26e0dfd48..e92a6e39a1c7 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -1,33 +1,25 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-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)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Hamcrest framework for matcher objects (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
+# does not run, even with all dependencies
+make_check=no
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/removed-packages/template b/srcpkgs/removed-packages/template
index 75b5bdc37865..adc4435cb341 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -336,6 +336,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-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SQLAlchemy<=1.3.18_4
From ec9a6a9e3483e4b84d5b6f607214a9b27c354af0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:24:14 -0400
Subject: [PATCH 32/33] python-six: remove package.
python 2, unused dep
---
srcpkgs/python3-six | 1 -
srcpkgs/{python-six => python3-six}/template | 25 +++++---------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 7 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-six
rename srcpkgs/{python-six => python3-six}/template (51%)
diff --git a/srcpkgs/python3-six b/srcpkgs/python3-six
deleted file mode 120000
index 70747adc77ed..000000000000
--- a/srcpkgs/python3-six
+++ /dev/null
@@ -1 +0,0 @@
-python-six
\ No newline at end of file
diff --git a/srcpkgs/python-six/template b/srcpkgs/python3-six/template
similarity index 51%
rename from srcpkgs/python-six/template
rename to srcpkgs/python3-six/template
index bae3a78bd13a..a3131b30966f 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python3-six/template
@@ -1,13 +1,13 @@
-# Template file for 'python-six'
-pkgname=python-six
+# Template file for 'python3-six'
+pkgname=python3-six
version=1.16.0
revision=2
wrksrc="six-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
+short_desc="Python 2 and 3 compatibility utilities (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/benjaminp/six"
@@ -18,16 +18,3 @@ checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
post_install() {
vlicense LICENSE
}
-
-do_check() {
- python3 -m pytest
-}
-
-python3-six_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 adc4435cb341..5767cf7ff799 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -418,6 +418,7 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-service_identity<=18.1.0_5
+ python-six<=1.16.0_2
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_5
python-sqlite<=2.8.3_1
From 46ddba64bd25102696fbc96ec9b38faa7203f80c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 07:30:05 -0400
Subject: [PATCH 33/33] python-zope.interface: remove package.
python2, unused dep
---
srcpkgs/python3-zope.interface | 1 -
.../template | 27 ++++++-------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 9 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/python3-zope.interface
rename srcpkgs/{python-zope.interface => python3-zope.interface}/template (50%)
diff --git a/srcpkgs/python3-zope.interface b/srcpkgs/python3-zope.interface
deleted file mode 120000
index 48f8d4c160ef..000000000000
--- a/srcpkgs/python3-zope.interface
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.interface
\ No newline at end of file
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python3-zope.interface/template
similarity index 50%
rename from srcpkgs/python-zope.interface/template
rename to srcpkgs/python3-zope.interface/template
index 94a22e87902e..99df64f00e3e 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python3-zope.interface/template
@@ -1,13 +1,13 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
+# Template file for 'python3-zope.interface'
+pkgname=python3-zope.interface
version=5.4.0
revision=2
wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Zope interfaces for Python3"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="ZPL-2.1"
homepage="https://github.com/zopefoundation/zope.interface"
@@ -19,17 +19,6 @@ make_check=no
post_install() {
# zope.interface provides the zope namespace
- for py_sitelib in $py2_sitelib $py3_sitelib; do
- vinstall src/zope/__init__.py 644 ${py_sitelib}/zope
- done
+ vinstall src/zope/__init__.py 644 ${py3_sitelib}/zope
vlicense LICENSE.txt LICENSE
}
-
-python3-zope.interface_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5767cf7ff799..00f85d799e73 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -432,6 +432,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.4.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (16 preceding siblings ...)
2022-10-06 11:52 ` classabbyamp
@ 2023-01-05 1:59 ` github-actions
2023-01-05 4:31 ` classabbyamp
` (14 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: github-actions @ 2023-01-05 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1371652062
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (17 preceding siblings ...)
2023-01-05 1:59 ` github-actions
@ 2023-01-05 4:31 ` classabbyamp
2023-04-28 1:53 ` github-actions
` (13 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2023-01-05 4:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1371652062
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (18 preceding siblings ...)
2023-01-05 4:31 ` classabbyamp
@ 2023-04-28 1:53 ` github-actions
2023-07-28 1:48 ` github-actions
` (12 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: github-actions @ 2023-04-28 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1526867348
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (19 preceding siblings ...)
2023-04-28 1:53 ` github-actions
@ 2023-07-28 1:48 ` github-actions
2023-10-11 21:45 ` [PR PATCH] [Updated] " classabbyamp
` (11 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: github-actions @ 2023-07-28 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1654855981
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (20 preceding siblings ...)
2023-07-28 1:48 ` github-actions
@ 2023-10-11 21:45 ` classabbyamp
2024-04-18 0:06 ` classabbyamp
` (10 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2023-10-11 21:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1923 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-pbr
- python-Twisted
- Twisted (transitional dummy package)
- python-openssl
- python-service_identity
- python-pyasn1-modules
- python-pyasn1
- python-cryptography
- python-enum34
- python-ipaddress
- python-cffi
- python-pycparser
- python-ply
- python-constantly
- python-incremental
- python-automat
- python-attrs
- python-hyperlink
- python-idna
- python-PyHamcrest
- python-six
- python-zope.interface
- 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: 51311 bytes --]
From 323e474e9ab26b0f41c88214a652aabe6df28217 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/32] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a86..0000000000000
--- 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 ae905fc67ab83..0000000000000
--- 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 aa695cd1c57bd..0000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 0cd7e4ef7cacc1169277e2037a614a545701fc6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/32] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd..0000000000000
--- 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 7b5c744083b90..0000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From bbb7f03166feb102427d2c2edfcd01f212dee97e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/32] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b0..0000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943..0000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From 46863dcffaaff4bbed2c414e2858e44c17792f9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/32] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1..0000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819c..0000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From ec7cf642b717ca7608fa88ec59135f38c5626a10 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/32] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c..0000000000000
--- 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 cf8ce771084df..0000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From 27bcf614dba2a47d87a095533d7016c10a8f45f8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/32] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e5..0000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From e1aa767c89e699d4e937288832d571fb87762010 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/32] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714..0000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From 1ae693211619bdb8776406a2bb792316bacaed3a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/32] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a46..0000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a31..0000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From 38adfcb3ff088a9256c90d5f3d93bdd7fc337582 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/32] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc..0000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4ca..0000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From cbb9d1712f332b5a7a4b317eda17040d0be80410 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/32] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e8570..0000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1..0000000000000
--- 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)"
From 42f74c320135d6fbe49ea46292fac05d1e4abebf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/32] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf3..0000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From 469cf4b3e14084f1c6deb9f4614bb04f9719f150 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/32] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930..0000000000000
--- 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 0ffe8186a9433..0000000000000
--- 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 3ed1355228d9d..0000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd..0000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From 4fa74a6938648a6c0a9b06b88232c0a869624af3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/32] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a..0000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From 7849a96cf707c203c557d84c786ed5e5a7be1386 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/32] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154..0000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From 9a95b8868e69948caa5310c1d50f312fcdffc24b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/32] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da73..0000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From b02ceacb0c6a90824d24406d9cd80687a6a1a143 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/32] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed..0000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From d0ab40ec675f9ee608644e60033d1b58e87b8a31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/32] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c7703070..0000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From e9e2acb4b39b226ac28a2cb62491cf765fcfac3a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/32] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1..0000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97..0000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From cef6ec3dd0917f5fd5340ab57879d89e001ec0d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/32] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b..0000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c..0000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From 419a498ad338fb44f447ddd0e2bdbafb4e874bc8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/32] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f7..0000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 220f6bf9a0800adbc5054949f0152e7da115e06d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/32] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae84..0000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 6cb64b045a8179b33346d4be49a3ac9fe8eb8624 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/32] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5d..0000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From 144969b4a99dfe57f4411681dca5588364df41a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/32] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3af..0000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83..0000000000000
--- 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)"
From 73168ca13864f70d167365ac77db52589aa71d34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/32] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec..0000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From c40c918b05b394dd5e25db06591acfdbe87d1d20 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/32] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 19 -------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 911adc8f8c853..0000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-version=1.15.1
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407e..0000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From f224075c17d433b74cbc9ca862e804627e2ae1a0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/32] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d..0000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From 8a12f59ea5fba97366b7edd2642a91feec621113 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/32] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924..0000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From 2c4fab0c7e27546d6b2c377208d550c66b6cb459 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/32] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999c..0000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From 2bc64d5036d7e56644c55e66f72de3caf57aa48c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/32] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa..0000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 5852a407ee694c47264faa8310dce08ee7186cc8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/32] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80b..0000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From a256b2e6ce7111e187209f00e65350493d417fb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/32] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c..0000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From a69b2e53e13ca72c0b2ef3eb846e3d7a0d47a16a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/32] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 33 ++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6930093c67437..052c97aaaaed0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20231009
+version=0.1.20231011
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -46,6 +46,8 @@ replaces="
bitcoin<=22.0_5
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -501,29 +503,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -531,8 +546,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -547,14 +566,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -571,8 +596,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -581,6 +611,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (21 preceding siblings ...)
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
` (9 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-04-18 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 624 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.
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: 89832 bytes --]
From 70563191f920cfa1fa7779fd7944cad600fa5fef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/38] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a864..00000000000000
--- 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 ae905fc67ab834..00000000000000
--- 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 aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 0a6f615142213dd7aa23a2e21d24fad691fde150 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/38] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd9..00000000000000
--- 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 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From e99e2fdab2c28a79b1b7319c629978a8e65d5c37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/38] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From 1f6d25416586d9dcf3e8df9111d4c18ce4def92e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/38] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From 1d736a9b5fe2e6cf2abd03c6882a87607f63a6fa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/38] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c7..00000000000000
--- 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 cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From fbd8f27e891dbbc06d8be63b9f1f96142411a31d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/38] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From c781f8ddda8c92fab6d0f9c53cc45f694da9ba27 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/38] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From 57551c983a7cb77d5bc0033130b666cc40b9b942 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/38] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From c3936c6661138f93d2e4784dbec7c4724113f128 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/38] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From d1cfcacf63a2e20d84d79e89ead7b0cfb09db6fa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/38] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1f..00000000000000
--- 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)"
From 9be49f766426323953e09a128082daff0ff80865 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/38] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From a830396d7720ced9d15fe34a4e867346333f7315 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/38] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930e..00000000000000
--- 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 0ffe8186a9433a..00000000000000
--- 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 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From a7eb290c50650471902d62566591c6f666703f0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/38] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From f0d0f8d9c905d66c5a351a6dce332a1a191bca9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/38] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From ee3dc794b60e664c6f7dc93f88a407abf553526e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/38] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From 7311d83e44e63cab28442ff02e4349ba4047ed95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/38] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From 9878d55a93d25c6f07e6f7153513160cb0504c82 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/38] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From e7bb9a0d12c6bac9025ed44568ed8e2ead2a838c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/38] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From 6101e0a580ddb10e1e99bbc29f8dcd872d9c40fc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/38] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From 8e7f37eb7e694e08d97a7875597e9ed25894de0c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/38] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 9aec665d76a17d819f966988f29bd31ad1258dcb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/38] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 84ca26f624fed6ca1a32b861af1062c5fd2134b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/38] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From 5875c26bc501dfb49571510b857511c588c4559a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/38] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83d..00000000000000
--- 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)"
From 7c6aaf03e333729f3e2e94a582c095f546d92f2f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/38] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From 28e3b069fdcf5c678d7e3eee9d9a863ed53cd24b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/38] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 19 -------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 949f6d6222c906..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-version=1.16.0
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From 37894e48349c1ca6d6c0e87f71bb340f3f9ab4eb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/38] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From b43870e3d187e37659fd472e7022fe3005c77b45 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/38] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From a69aac8a2eccfbed6233a6a6a010b2bb205328a2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/38] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From 043c4c02b90d6bc575565e36d6f49f1283ef7fb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/38] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 3ab58d9c35abe2c387be9cbc8c60d6bf0d6429c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/38] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From d9762c898d533ef30fa72621b4a8104c8a46dff4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/38] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From e3cfa6be999938b16f1a45621ee5b0e484708f67 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/38] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a9821553808851..c8ea52100bc2d3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -46,6 +46,8 @@ replaces="
bitcoin<=22.0_5
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -515,29 +517,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -545,8 +560,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -561,14 +580,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -585,8 +610,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -595,6 +625,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-Flask-Assets<=0.12_9
python3-Flask-Mail<=0.9.1_5
From a58535abb5bc24204b2e2f5b99e85f33b8b65b6c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:56 -0400
Subject: [PATCH 33/38] python-pip: remove
python2
---
.../python-pip/patches/no-versioned-pip.patch | 13 -------------
srcpkgs/python-pip/template | 19 -------------------
srcpkgs/python-pip/update | 2 --
3 files changed, 34 deletions(-)
delete mode 100644 srcpkgs/python-pip/patches/no-versioned-pip.patch
delete mode 100644 srcpkgs/python-pip/template
delete mode 100644 srcpkgs/python-pip/update
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch
deleted file mode 100644
index 17c0a38d434d2b..00000000000000
--- a/srcpkgs/python-pip/patches/no-versioned-pip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -75,10 +75,6 @@
- entry_points={
- "console_scripts": [
- "pip=pip._internal.cli.main:main",
-- "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
-- "pip{}.{}=pip._internal.cli.main:main".format(
-- *sys.version_info[:2]
-- ),
- ],
- },
-
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index 00d8875f2f9e2a..00000000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.3.4
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc
-
-post_install() {
- vlicense LICENSE.txt
- mv ${DESTDIR}/usr/bin/pip{,2}
-}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
deleted file mode 100644
index 88ebcc780cfc3f..00000000000000
--- a/srcpkgs/python-pip/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# Support for Python 2 was dropped in pip >= 21
-pattern='pip-\K20\.[0-9.]+(?=.tar.gz)'
From b7d046ea77c51e8f448d7c5cc214f10264e95443 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:43:37 -0400
Subject: [PATCH 34/38] python-setuptools: remove
python 2
---
srcpkgs/python-setuptools/template | 26 --------------------------
srcpkgs/python-setuptools/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-setuptools/template
delete mode 100644 srcpkgs/python-setuptools/update
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
deleted file mode 100644
index 5c5faa52fec451..00000000000000
--- a/srcpkgs/python-setuptools/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
-# https://github.com/pypa/setuptools/issues/1458
-# python2 support for setuptools ended at 44.0.0
-version=44.0.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pypa/setuptools"
-distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
-checksum=e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008
-alternatives="setuptools:easy_install:/usr/bin/easy_install2"
-provides="python-distribute-${version}_1"
-replaces="python-distribute>=0"
-
-export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
-export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-
-post_install() {
- vlicense LICENSE
- mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
-}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python-setuptools/update
deleted file mode 100644
index 5d1cf3e06f1a78..00000000000000
--- a/srcpkgs/python-setuptools/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="44\.[\d]+\.[\d]+"
From bc55fde6dfdfeefe04ea0f476522ca3809e148b5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:32 -0400
Subject: [PATCH 35/38] python-tkinter: remove
python2
---
srcpkgs/idle-python | 1 -
srcpkgs/python-tkinter/files/cross.patch | 1 -
srcpkgs/python-tkinter/files/idle2.desktop | 9 --
srcpkgs/python-tkinter/files/idle2.xpm | 124 ---------------------
srcpkgs/python-tkinter/template | 91 ---------------
srcpkgs/python-tkinter/update | 1 -
6 files changed, 227 deletions(-)
delete mode 120000 srcpkgs/idle-python
delete mode 120000 srcpkgs/python-tkinter/files/cross.patch
delete mode 100644 srcpkgs/python-tkinter/files/idle2.desktop
delete mode 100644 srcpkgs/python-tkinter/files/idle2.xpm
delete mode 100644 srcpkgs/python-tkinter/template
delete mode 120000 srcpkgs/python-tkinter/update
diff --git a/srcpkgs/idle-python b/srcpkgs/idle-python
deleted file mode 120000
index 0d091609e96672..00000000000000
--- a/srcpkgs/idle-python
+++ /dev/null
@@ -1 +0,0 @@
-python-tkinter
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
deleted file mode 120000
index c27b8a16c11313..00000000000000
--- a/srcpkgs/python-tkinter/files/cross.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python-tkinter/files/idle2.desktop
deleted file mode 100644
index ee6fad11773669..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=IDLE (using Python2)
-Comment=IDE for Python (using Python2)
-Exec=idle2
-Icon=idle2
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=true
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python-tkinter/files/idle2.xpm
deleted file mode 100644
index 964cbefdeb3dd5..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.xpm
+++ /dev/null
@@ -1,124 +0,0 @@
-/* XPM */
-static char *python[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 102 2 ",
-" c #EBBB18",
-". c #EBBE21",
-"X c #F3C11A",
-"o c #FAC719",
-"O c #FDCB1B",
-"+ c #FFCC1C",
-"@ c #EBC22A",
-"# c #FFCF23",
-"$ c #FFCF24",
-"% c #FFD025",
-"& c #FFD026",
-"* c #FFD32D",
-"= c #FDD22F",
-"- c #FFD32E",
-"; c #FFD32F",
-": c #EBC534",
-"> c #E8C73D",
-", c #FFD330",
-"< c #FFD430",
-"1 c #FDD536",
-"2 c #FFD637",
-"3 c #FAD339",
-"4 c #FFD738",
-"5 c #FFD739",
-"6 c #FFD73A",
-"7 c #F9D53E",
-"8 c #FFD83A",
-"9 c #ECCE45",
-"0 c #FDD941",
-"q c #FFDA41",
-"w c #FFDA42",
-"e c #FFDB42",
-"r c #FFDB43",
-"t c #FFDB44",
-"y c #FDDD4A",
-"u c #FFDE4B",
-"i c #FFDF4D",
-"p c #FDDE4E",
-"a c #FFDF4E",
-"s c #FFE255",
-"d c #FFE357",
-"f c #FFE358",
-"g c #FFE661",
-"h c #FFE761",
-"j c #FFE762",
-"k c #F2E16E",
-"l c #F5E36F",
-"z c #FDE96A",
-"x c #FFEB6C",
-"c c #326087",
-"v c #366690",
-"b c #366791",
-"n c #356892",
-"m c #366993",
-"M c #366994",
-"N c #376896",
-"B c #376A96",
-"V c #396C96",
-"C c #386C97",
-"Z c #396D99",
-"A c #3A6F9B",
-"S c #3A709C",
-"D c #3B709C",
-"F c #3B709D",
-"G c #3C719E",
-"H c #3D73A0",
-"J c #3D73A2",
-"K c #3D74A1",
-"L c #3E74A2",
-"P c #3E75A3",
-"I c #3F76A5",
-"U c #4078A6",
-"Y c #4078A7",
-"T c #4179A8",
-"R c #427BAA",
-"E c #437CAB",
-"W c #437DAD",
-"Q c #437DAE",
-"! c #447DAD",
-"~ c #447EAD",
-"^ c #457FAF",
-"/ c #4680B0",
-"( c #4680B1",
-") c #4681B2",
-"_ c #4781B2",
-"` c #4883B4",
-"' c #4884B5",
-"] c #4885B6",
-"[ c #4985B7",
-"{ c #4A87B9",
-"} c #4A86BA",
-"| c #4B88BB",
-" . c #4C89BC",
-".. c #4C8ABC",
-"X. c #4D8BBE",
-"o. c #4C8ABF",
-"O. c #4E8DC0",
-"+. c #4F8DC1",
-"@. c #508FC3",
-"#. c #5291C6",
-"$. c gray100",
-"%. c None",
-/* pixels */
-"%.%.%.%.+.} ( W I G N %.%.%.%.%.",
-"%.%.%.%...$.( R L S B %.%.%.%.%.",
-"%.%.%.%.] ( R L D B m %.%.%.%.%.",
-"%.%.o.] W L V v V B B %.%.%.%.%.",
-"#.+. .` ^ U G A m B B %.s u 7 %.",
-"@.o._ ^ R G A m m m c %.u q 1 %.",
-"o.] _ R L G B B n c %.9 q 1 * %.",
-"] _ E U m %.%.%.%.%.%.q 5 * # %.",
-"( E U n %.k z j s a t 5 * $ O %.",
-"W R K %.l x j f a t 5 * $ + X %.",
-"%.K D %.x j f a q 8 * $ + + %.%.",
-"%.%.%.%.j f a > : @ . %.%.%.",
-"%.%.%.%.f a t 5 , % + %.%.%.%.%.",
-"%.%.%.%.a t 5 < % $.O %.%.%.%.%.",
-"%.%.%.%.%.3 , % + o %.%.%.%.%.%.",
-"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%."
-};
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
deleted file mode 100644
index 1f6c0d0ce627d7..00000000000000
--- a/srcpkgs/python-tkinter/template
+++ /dev/null
@@ -1,91 +0,0 @@
-# Template file for 'python-tkinter'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
-#
-
-_desc="Interpreted, interactive, object-oriented programming language"
-
-pkgname=python-tkinter
-version=2.7.18.7
-revision=2
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-pycompile_dirs="usr/lib/python2.7/lib-tk"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel tk-devel"
-short_desc="${_desc} - GUI toolkit for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
-homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- fi
- ./configure ${configure_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
-
- mkdir -p ${wrksrc}/tmp-destdir/usr/lib
- ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
-
- make DESTDIR=${wrksrc}/tmp-destdir altinstall
-
- # We only care for the idle and tk modules.
- vmkdir usr/bin
- vmkdir usr/lib/python2.7/lib-dynload
- mv ${wrksrc}/tmp-destdir/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/idlelib \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-tk \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-dynload/_tkinter.so \
- ${DESTDIR}/usr/lib/python2.7/lib-dynload/
- ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2
-}
-
-idle-python_package() {
- short_desc="${_desc} - IDE for Python2 using Tkinter"
- pycompile_dirs="usr/lib/python2.7/idlelib"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/bin/idle2*
- vmove usr/lib/python2.7/idlelib
- vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps
- vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
- }
-}
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
From 371ac19c716d4a5dcabe1c417f0094b3b00bf3b0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:41:55 -0400
Subject: [PATCH 36/38] python: remove
closes #38229
---
srcpkgs/python-devel | 1 -
srcpkgs/python/files/cross.patch | 88 --------------
srcpkgs/python/patches/fix-i686-rlock.patch | 55 ---------
srcpkgs/python/patches/fix-pr-21.patch | 17 ---
.../python/patches/musl-find_library.patch | 44 -------
srcpkgs/python/patches/sysconfig.patch | 22 ----
srcpkgs/python/template | 114 ------------------
srcpkgs/python/update | 1 -
srcpkgs/removed-packages/template | 14 ++-
9 files changed, 10 insertions(+), 346 deletions(-)
delete mode 120000 srcpkgs/python-devel
delete mode 100644 srcpkgs/python/files/cross.patch
delete mode 100644 srcpkgs/python/patches/fix-i686-rlock.patch
delete mode 100644 srcpkgs/python/patches/fix-pr-21.patch
delete mode 100644 srcpkgs/python/patches/musl-find_library.patch
delete mode 100644 srcpkgs/python/patches/sysconfig.patch
delete mode 100644 srcpkgs/python/template
delete mode 100644 srcpkgs/python/update
diff --git a/srcpkgs/python-devel b/srcpkgs/python-devel
deleted file mode 120000
index d8654aa0e2f2f3..00000000000000
--- a/srcpkgs/python-devel
+++ /dev/null
@@ -1 +0,0 @@
-python
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python/files/cross.patch
deleted file mode 100644
index 04a20a75dad792..00000000000000
--- a/srcpkgs/python/files/cross.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -1000,12 +1002,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- $(DESTDIR)$(LIBDEST)/distutils/tests ; \
- fi
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- $(DESTDIR)$(LIBDEST)
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-@@ -1133,11 +1135,13 @@ libainstall: all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
-+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+ --skip-build \
- --prefix=$(prefix) \
-- --install-scripts=$(BINDIR) \
-- --install-platlib=$(DESTSHARED) \
-- --root=$(DESTDIR)/
-+ --install-scripts=$(DESTDIR)$(BINDIR) \
-+ --install-platlib=$(DESTDIR)$(DESTSHARED) \
-+ --root=/
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
-
- # Here are a couple of targets for MacOSX again, to install a full
---- setup.py.orig 2013-11-10 08:36:41.000000000 +0100
-+++ setup.py 2013-11-18 21:27:27.222000786 +0100
-@@ -17,7 +17,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
- from distutils.spawn import find_executable
-
--cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-+cross_compiling = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('PYTHONXCPREFIX' in os.environ)
-
- def get_platform():
- # cross build
-@@ -324,6 +324,9 @@ class PyBuildExt(build_ext):
-
- # Don't try to load extensions for cross builds
- if cross_compiling:
-+ self.announce(
-+ 'WARNING: skipping import check for cross-compiled: "%s"' %
-+ ext.name)
- return
-
- try:
-@@ -478,7 +481,7 @@ class PyBuildExt(build_ext):
- for directory in reversed(options.dirs):
- add_dir_to_list(dir_list, directory)
-
-- if os.path.normpath(sys.prefix) != '/usr' \
-+ if os.path.normpath(sys.prefix) != '/usr' and not cross_compiling \
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
- # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
- # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-@@ -554,6 +557,11 @@ class PyBuildExt(build_ext):
- if host_platform in ['darwin', 'beos']:
- math_libs = []
-
-+ # Insert libraries and headers from XBPS_CROSS_BASE
-+ if 'XBPS_CROSS_BASE' in os.environ:
-+ lib_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/lib']
-+ inc_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/include']
-+
- # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
- #
-@@ -2020,6 +2028,11 @@ class PyBuildExt(build_ext):
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
-+ if cross_compiling:
-+ cmd = "cd %s && env CFLAGS='' '%s/configure' --host=%s --build=%s %s" \
-+ % (ffi_builddir, ffi_srcdir, os.environ.get('HOSTARCH'),
-+ os.environ.get('BUILDARCH'), " ".join(config_args))
-+ else:
- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python/patches/fix-i686-rlock.patch
deleted file mode 100644
index 94e5567bece90c..00000000000000
--- a/srcpkgs/python/patches/fix-i686-rlock.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-It seems that avoiding to create local aliases for the self._rlock and
-self._wlock methods prevents the strange errors on i686 related to
-semaphore locking and unlocking.
-
-One example of failing builds is firefox-esr running gyp in an i686 environment.
-
---- a/Lib/multiprocessing/queues.py 2017-09-16 19:38:35.000000000 +0200
-+++ b/Lib/multiprocessing/queues.py 2017-10-24 19:49:06.291351206 +0200
-@@ -369,13 +369,11 @@
-
- def _make_methods(self):
-- recv = self._reader.recv
-- racquire, rrelease = self._rlock.acquire, self._rlock.release
- def get():
-- racquire()
-- try:
-- return recv()
-- finally:
-- rrelease()
-+ self._rlock.acquire()
-+ try:
-+ return self._reader.recv()
-+ finally:
-+ self._rlock.release()
- self.get = get
-
- if self._wlock is None:
-@@ -383,11 +382,9 @@
- self.put = self._writer.send
- else:
-- send = self._writer.send
-- wacquire, wrelease = self._wlock.acquire, self._wlock.release
- def put(obj):
-- wacquire()
-- try:
-- return send(obj)
-- finally:
-- wrelease()
-+ self._wlock.acquire()
-+ try:
-+ return self._writer.send(obj)
-+ finally:
-+ self._wlock.release()
- self.put = put
---- a/Modules/_multiprocessing/semaphore.c 2017-09-16 19:38:35.000000000 +0200
-+++ b/Modules/_multiprocessing/semaphore.c 2017-10-28 10:49:56.944993401 +0200
-@@ -378,7 +378,7 @@
- }
- }
- #else
-- int sval;
-+ int sval = -1;
-
- /* This check is not an absolute guarantee that the semaphore
- does not rise above maxvalue. */
diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch
deleted file mode 100644
index e1e5b771e79a16..00000000000000
--- a/srcpkgs/python/patches/fix-pr-21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Include/pyport.h
-+++ b/Include/pyport.h
-@@ -947,7 +947,6 @@
- #define Py_ULL(x) Py_LL(x##U)
- #endif
-
--#ifdef Py_BUILD_CORE
- /*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (issue23524).
-@@ -965,6 +964,5 @@
- #define _Py_END_SUPPRESS_IPH
-
- #endif /* _MSC_VER >= 1900 */
--#endif /* Py_BUILD_CORE */
-
- #endif /* Py_PYPORT_H */
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python/patches/musl-find_library.patch
deleted file mode 100644
index 82f436b4072bd8..00000000000000
--- a/srcpkgs/python/patches/musl-find_library.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -204,6 +204,41 @@
- def find_library(name, is64 = False):
- return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
-
-+ elif True:
-+
-+ # Patched for Alpine Linux / musl - search manually system paths
-+ def _is_elf(filepath):
-+ try:
-+ with open(filepath, 'rb') as fh:
-+ return fh.read(4) == b'\x7fELF'
-+ except:
-+ return False
-+
-+ def find_library(name):
-+ from glob import glob
-+ # absolute name?
-+ if os.path.isabs(name):
-+ return name
-+ # special case for libm, libcrypt and libpthread and musl
-+ if name in ['m', 'crypt', 'pthread']:
-+ name = 'c'
-+ elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']:
-+ name = 'libc.so'
-+ # search in standard locations (musl order)
-+ paths = ['/lib', '/usr/local/lib', '/usr/lib']
-+ if 'LD_LIBRARY_PATH' in os.environ:
-+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
-+ for d in paths:
-+ f = os.path.join(d, name)
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
-+ prefix = os.path.join(d, 'lib'+name)
-+ for suffix in ['.so', '.so.*']:
-+ for f in glob('{0}{1}'.format(prefix, suffix)):
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
- else:
-
- def _findSoname_ldconfig(name):
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python/patches/sysconfig.patch
deleted file mode 100644
index 6a089a89adb4a0..00000000000000
--- a/srcpkgs/python/patches/sysconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200
-+++ b/Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100
-@@ -181,8 +171,8 @@
- _osx_support.customize_compiler(_config_vars)
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
-
-- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-- get_config_vars('CC', 'CXX', 'CFLAGS',
-+ (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-+ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
-
-@@ -206,7 +196,7 @@
- if 'LDFLAGS' in os.environ:
- ldshared = ldshared + ' ' + os.environ['LDFLAGS']
- if 'CFLAGS' in os.environ:
-- cflags = cflags + ' ' + os.environ['CFLAGS']
-+ cflags = opt + ' ' + os.environ['CFLAGS']
- ldshared = ldshared + ' ' + os.environ['CFLAGS']
- if 'CPPFLAGS' in os.environ:
- cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
deleted file mode 100644
index 99d9642e998ab4..00000000000000
--- a/srcpkgs/python/template
+++ /dev/null
@@ -1,114 +0,0 @@
-# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
-pkgname=python
-version=2.7.18.7
-revision=5
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
-homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
- fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
- make DESTDIR=${DESTDIR} altinstall
- ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
- ln -sf python2.7 ${DESTDIR}/usr/bin/python2
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
- ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
- ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
- chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/smtpd.py
- mv ${DESTDIR}/usr/bin/2to3{,-2.7}
- mv ${DESTDIR}/usr/bin/pydoc{,2.7}
- # Remove files that belong to python-tkinter and idle-python
- rm ${DESTDIR}/usr/bin/idle
- rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
- rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
- # Remove test module and tests that fail to be byte-compiled.
- rm -r ${DESTDIR}/usr/lib/python2.7/test
- rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
- # Remove references to the install(1) wrapper.
- vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- if [ "$CROSS_BUILD" ]; then
- # Remove references to cross toolchain.
- vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- fi
-}
-
-python-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/python*-config
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove usr/lib/python2.7/config/libpython2.7.a
- mkdir -p ${DESTDIR}/usr/include/python2.7
- mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
- ${DESTDIR}/usr/include/python2.7
- }
-}
diff --git a/srcpkgs/python/update b/srcpkgs/python/update
deleted file mode 100644
index cfb8828f7e490a..00000000000000
--- a/srcpkgs/python/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='v\K2\.7\.[\d.]*\d'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c8ea52100bc2d3..e14c508061fd98 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -286,6 +286,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ idle-python<=2.7.18.7_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
@@ -331,6 +332,8 @@ replaces="
libbitcoin-server<=3.6.0_10
libbitcoin-system-devel<=3.6.0_10
libbitcoin-system<=3.6.0_10
+ libclang-32bit<=15.0.7_3
+ libclang-cpp-32bit<=15.0.7_3
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
@@ -403,6 +406,8 @@ replaces="
libzapojit<=0.0.3_10
litecoin<=0.18.1_11
livewallpaper<=0.5.0_2
+ lld-devel<=15.0.7_3
+ lldb-devel<=15.0.7_3
llvm10<=10.0.0_8
llvm11<=11.0.0_2
llvm3.9<=3.9.1_5
@@ -549,6 +554,7 @@ replaces="
python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
python-decorator<=4.4.2_2
+ python-devel<=2.7.18.7_4
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
@@ -586,6 +592,7 @@ replaces="
python-pathlib2<=2.3.4_6
python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
+ python-pip<=20.3.4_1
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
python-ply<=3.11_7
@@ -611,12 +618,14 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-service_identity<=18.1.0_7
+ python-setuptools<=44.0.0_2
python-six<=1.16.0_3
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
python-sqlparse<=0.3.0_6
python-tempita<=0.5.2_8
+ python-tkinter<=2.7.18.7_2
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -658,6 +667,7 @@ replaces="
python3-sqlalchemy-migrate<=0.12.0_6
python3-stormssh<=0.7.0_7
python3-txacme<=0.9.3_3
+ python<=2.7.18.7_4
qimageblitz<=0.0.6_4
qt-designer-devel<=4.8.7_29
qt-designer-libs<=4.8.7_29
@@ -760,10 +770,6 @@ replaces="
zou<=0.2.0_7
zuluplay-devel<=1.1_1
zuluplay<=1.1_1
- lldb-devel<=15.0.7_3
- lld-devel<=15.0.7_3
- libclang-32bit<=15.0.7_3
- libclang-cpp-32bit<=15.0.7_3
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 86a8d772f9647aba9734e00b9fcdcbbf16224017 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 37/38] Manual.md: remove python 2 documentation
---
Manual.md | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Manual.md b/Manual.md
index 34c737e6df427d..156ac3bb78a7fa 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
language prefix can be dropped. Short names for languages are no valid substitute
for the language prefix.
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
<a id="language_bindings"></a>
#### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
<name>-<language>
```
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
<a id="programs"></a>
#### Programs
@@ -592,9 +592,9 @@ build methods. By default set to `check`.
- `make_install_target` The installation target. When `${build_style}` is set to `configure`,
`gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
current directory with respect to the install.
- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1039,8 +1039,6 @@ Additional install arguments can be specified via `make_install_args`.
- `waf3` For packages that use the Python3 `waf` build method with python3.
-- `waf` For packages that use the Python `waf` method with python2.
-
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
@@ -1069,8 +1067,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python2-module` to build Python 2.x modules
-
- `python3-module` to build Python 3.x modules
- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1589,7 +1585,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
<a id="pkgs_python"></a>
#### Python packages
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
This sets some environment variables required to allow cross compilation. Support to allow
building a python module for multiple versions from a single template is also possible.
The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1614,7 +1610,7 @@ The following variables may influence how the python packages are built and conf
at post-install time:
- `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
at install time as python modules. This variable expects subset of them that
should be byte-compiled, if default is wrong. Multiple python modules may be specified separated
by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into
@@ -1635,10 +1631,6 @@ Also, a set of useful variables are defined to use in the templates:
| Variable | Value |
|-------------|----------------------------------|
-| py2_ver | 2.X |
-| py2_lib | usr/lib/python2.X |
-| py2_sitelib | usr/lib/python2.X/site-packages |
-| py2_inc | usr/include/python2.X |
| py3_ver | 3.X |
| py3_lib | usr/lib/python3.X |
| py3_sitelib | usr/lib/python3.X/site-packages |
From 96d06b1221158e516a490d942a3fb6bc47ae2ef3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:35:04 -0400
Subject: [PATCH 38/38] common: remove python 2-specific code
---
common/build-style/python2-module.sh | 34 -------------------
common/build-style/waf.sh | 21 ------------
common/environment/setup/python.sh | 5 ---
.../04-create-xbps-metadata-scripts.sh | 2 --
4 files changed, 62 deletions(-)
delete mode 100644 common/build-style/python2-module.sh
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/python2-module.sh b/common/build-style/python2-module.sh
deleted file mode 100644
index 0a31b157dfc2f3..00000000000000
--- a/common/build-style/python2-module.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This helper is for templates installing python2-only modules.
-#
-
-do_build() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py build ${make_build_args}
- else
- python2 setup.py build ${make_build_args}
- fi
-}
-
-do_install() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py \
- install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- else
- python2 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- fi
-}
diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
- --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ab5c47d52847b1..0aa40f908f8827 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,11 +2,6 @@
# Useful variables for determining Python version and paths.
#
-py2_ver="2.7"
-py2_lib="usr/lib/python${py2_ver}"
-py2_sitelib="${py2_lib}/site-packages"
-py2_inc="usr/include/python${py2_ver}"
-
py3_ver="3.12"
py3_abiver=""
py3_lib="usr/lib/python${py3_ver}"
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 69e318a560819e..dee6832c6a8057 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -278,8 +278,6 @@ _EOF
if [ "$pycompile_version" = 3 ]; then
pycompile_version=${py3_ver}
- elif [ "$pycompile_version" = 2 ]; then
- pycompile_version=${py2_ver}
fi
if [ -n "${pycompile_dirs}" -o -n "${pycompile_module}" ]; then
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (22 preceding siblings ...)
2024-04-18 0:06 ` classabbyamp
@ 2024-04-18 0:07 ` classabbyamp
2024-04-18 0:07 ` classabbyamp
` (8 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-04-18 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1526867348
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (23 preceding siblings ...)
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
` (7 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-04-18 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-1654855981
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (24 preceding siblings ...)
2024-04-18 0:07 ` classabbyamp
@ 2024-04-18 0:18 ` classabbyamp
2024-09-27 19:17 ` leahneukirchen
` (6 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-04-18 0:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 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, python 2: 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.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
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: 89832 bytes --]
From b09cea33f0915ae31a3f97856b1338d9d8ff6043 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/38] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a864..00000000000000
--- 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 ae905fc67ab834..00000000000000
--- 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 aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 13212d0f8be9f3dfa6f79c2890510e0c6e4b73b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/38] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd9..00000000000000
--- 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 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From bcd5267a93200db1ad96735f249f07469a6a24c0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/38] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From 422198794939fb0122198599bd77d09ca575267b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/38] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From bc7a4284932fb2c431fa1014c611a7ba2ed47cda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/38] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c7..00000000000000
--- 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 cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From 80980fe1eba15c915e9d4f5eb97999e8d3167bf9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/38] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From 471ce62f9f65cbd9592d5a4b4e90b86c8634e381 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/38] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From dac53d315e2fa0d3bf2ebd4f6f0e65d70a282de6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/38] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From a402937aa3379214faeb3fdc5366447d0697e9c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/38] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From 43a4bf426a33e7ef9026688187050018e653d39d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/38] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1f..00000000000000
--- 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)"
From aeb0e486fa293abf93fd0f89c299e28c60db8438 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/38] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From 029255ed87cffc6de7bedd1d8784bccc0af4ee1d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/38] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930e..00000000000000
--- 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 0ffe8186a9433a..00000000000000
--- 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 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From 7760931e8a1cec7aad0d65fd0c3b8912a6be4bcf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/38] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From 1e43228129d0d3739a78a883774a772d9393b4de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/38] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From 300ea7d56a945ed5ff4db9f9f21e04bed6bd3de3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/38] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From f471ec897ef4fd76a9c81414bba5c4e76d166d23 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/38] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From b80e6c81bad559055abaa067c0c3d458ae056f9e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/38] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From e2a2426d0b5dbfa6deb060b5166c55229bd45ae0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/38] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From 9036c314ae13ab49453903c726653344b96c872a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/38] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From e95058d3f604ee440fec95dd6cdcc8ba2ba5ec61 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/38] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From d41e7d4bdb91fe6108e1e43e50083c12a7325801 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/38] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From bfa758554dbac635d8a2cb816827aa785f9ae68b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/38] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From 812331d3182a0c0270bdd86d51e631ff0749de31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/38] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83d..00000000000000
--- 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)"
From 220c03c587927d255727aee3263d942a2e11a6d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/38] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From fbec137c8675a4e55a4728734c98a6a37f9c45cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/38] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 19 -------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 949f6d6222c906..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-version=1.16.0
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From 8df9e2fc66a0742c4a32c6437a8dcbccb380ada1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/38] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From 4f77a2de0db8b5d51b82789eff34be93d19a17c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/38] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From 681f34727bd5c886bcd5d8bae5cac054b42058d8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/38] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From 162e648a2b50e3325a2064df786911ba2c698d33 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/38] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 5821bf4a58f0c5df6479ef0e299b18739f0ca631 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/38] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 50c1415d55bc8ae7d0c26e37319902d909bbc512 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/38] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From 2260b1226e956e6e485b7e0d9e5249514fc163c9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/38] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a9821553808851..c8ea52100bc2d3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -46,6 +46,8 @@ replaces="
bitcoin<=22.0_5
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -515,29 +517,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -545,8 +560,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -561,14 +580,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -585,8 +610,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -595,6 +625,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-Flask-Assets<=0.12_9
python3-Flask-Mail<=0.9.1_5
From 7a19d1b4154dd63dc8dc3cfdf1274bce227b1866 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:56 -0400
Subject: [PATCH 33/38] python-pip: remove
python2
---
.../python-pip/patches/no-versioned-pip.patch | 13 -------------
srcpkgs/python-pip/template | 19 -------------------
srcpkgs/python-pip/update | 2 --
3 files changed, 34 deletions(-)
delete mode 100644 srcpkgs/python-pip/patches/no-versioned-pip.patch
delete mode 100644 srcpkgs/python-pip/template
delete mode 100644 srcpkgs/python-pip/update
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch
deleted file mode 100644
index 17c0a38d434d2b..00000000000000
--- a/srcpkgs/python-pip/patches/no-versioned-pip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -75,10 +75,6 @@
- entry_points={
- "console_scripts": [
- "pip=pip._internal.cli.main:main",
-- "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
-- "pip{}.{}=pip._internal.cli.main:main".format(
-- *sys.version_info[:2]
-- ),
- ],
- },
-
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index 00d8875f2f9e2a..00000000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.3.4
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc
-
-post_install() {
- vlicense LICENSE.txt
- mv ${DESTDIR}/usr/bin/pip{,2}
-}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
deleted file mode 100644
index 88ebcc780cfc3f..00000000000000
--- a/srcpkgs/python-pip/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# Support for Python 2 was dropped in pip >= 21
-pattern='pip-\K20\.[0-9.]+(?=.tar.gz)'
From e43243d61fcad85e9f78bda4970c38e4584d6095 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:43:37 -0400
Subject: [PATCH 34/38] python-setuptools: remove
python 2
---
srcpkgs/python-setuptools/template | 26 --------------------------
srcpkgs/python-setuptools/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-setuptools/template
delete mode 100644 srcpkgs/python-setuptools/update
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
deleted file mode 100644
index 5c5faa52fec451..00000000000000
--- a/srcpkgs/python-setuptools/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
-# https://github.com/pypa/setuptools/issues/1458
-# python2 support for setuptools ended at 44.0.0
-version=44.0.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pypa/setuptools"
-distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
-checksum=e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008
-alternatives="setuptools:easy_install:/usr/bin/easy_install2"
-provides="python-distribute-${version}_1"
-replaces="python-distribute>=0"
-
-export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
-export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-
-post_install() {
- vlicense LICENSE
- mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
-}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python-setuptools/update
deleted file mode 100644
index 5d1cf3e06f1a78..00000000000000
--- a/srcpkgs/python-setuptools/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="44\.[\d]+\.[\d]+"
From dd6aac018c0de15d387d8e325940db904810a63d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:32 -0400
Subject: [PATCH 35/38] python-tkinter: remove
python2
---
srcpkgs/idle-python | 1 -
srcpkgs/python-tkinter/files/cross.patch | 1 -
srcpkgs/python-tkinter/files/idle2.desktop | 9 --
srcpkgs/python-tkinter/files/idle2.xpm | 124 ---------------------
srcpkgs/python-tkinter/template | 91 ---------------
srcpkgs/python-tkinter/update | 1 -
6 files changed, 227 deletions(-)
delete mode 120000 srcpkgs/idle-python
delete mode 120000 srcpkgs/python-tkinter/files/cross.patch
delete mode 100644 srcpkgs/python-tkinter/files/idle2.desktop
delete mode 100644 srcpkgs/python-tkinter/files/idle2.xpm
delete mode 100644 srcpkgs/python-tkinter/template
delete mode 120000 srcpkgs/python-tkinter/update
diff --git a/srcpkgs/idle-python b/srcpkgs/idle-python
deleted file mode 120000
index 0d091609e96672..00000000000000
--- a/srcpkgs/idle-python
+++ /dev/null
@@ -1 +0,0 @@
-python-tkinter
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
deleted file mode 120000
index c27b8a16c11313..00000000000000
--- a/srcpkgs/python-tkinter/files/cross.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python-tkinter/files/idle2.desktop
deleted file mode 100644
index ee6fad11773669..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=IDLE (using Python2)
-Comment=IDE for Python (using Python2)
-Exec=idle2
-Icon=idle2
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=true
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python-tkinter/files/idle2.xpm
deleted file mode 100644
index 964cbefdeb3dd5..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.xpm
+++ /dev/null
@@ -1,124 +0,0 @@
-/* XPM */
-static char *python[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 102 2 ",
-" c #EBBB18",
-". c #EBBE21",
-"X c #F3C11A",
-"o c #FAC719",
-"O c #FDCB1B",
-"+ c #FFCC1C",
-"@ c #EBC22A",
-"# c #FFCF23",
-"$ c #FFCF24",
-"% c #FFD025",
-"& c #FFD026",
-"* c #FFD32D",
-"= c #FDD22F",
-"- c #FFD32E",
-"; c #FFD32F",
-": c #EBC534",
-"> c #E8C73D",
-", c #FFD330",
-"< c #FFD430",
-"1 c #FDD536",
-"2 c #FFD637",
-"3 c #FAD339",
-"4 c #FFD738",
-"5 c #FFD739",
-"6 c #FFD73A",
-"7 c #F9D53E",
-"8 c #FFD83A",
-"9 c #ECCE45",
-"0 c #FDD941",
-"q c #FFDA41",
-"w c #FFDA42",
-"e c #FFDB42",
-"r c #FFDB43",
-"t c #FFDB44",
-"y c #FDDD4A",
-"u c #FFDE4B",
-"i c #FFDF4D",
-"p c #FDDE4E",
-"a c #FFDF4E",
-"s c #FFE255",
-"d c #FFE357",
-"f c #FFE358",
-"g c #FFE661",
-"h c #FFE761",
-"j c #FFE762",
-"k c #F2E16E",
-"l c #F5E36F",
-"z c #FDE96A",
-"x c #FFEB6C",
-"c c #326087",
-"v c #366690",
-"b c #366791",
-"n c #356892",
-"m c #366993",
-"M c #366994",
-"N c #376896",
-"B c #376A96",
-"V c #396C96",
-"C c #386C97",
-"Z c #396D99",
-"A c #3A6F9B",
-"S c #3A709C",
-"D c #3B709C",
-"F c #3B709D",
-"G c #3C719E",
-"H c #3D73A0",
-"J c #3D73A2",
-"K c #3D74A1",
-"L c #3E74A2",
-"P c #3E75A3",
-"I c #3F76A5",
-"U c #4078A6",
-"Y c #4078A7",
-"T c #4179A8",
-"R c #427BAA",
-"E c #437CAB",
-"W c #437DAD",
-"Q c #437DAE",
-"! c #447DAD",
-"~ c #447EAD",
-"^ c #457FAF",
-"/ c #4680B0",
-"( c #4680B1",
-") c #4681B2",
-"_ c #4781B2",
-"` c #4883B4",
-"' c #4884B5",
-"] c #4885B6",
-"[ c #4985B7",
-"{ c #4A87B9",
-"} c #4A86BA",
-"| c #4B88BB",
-" . c #4C89BC",
-".. c #4C8ABC",
-"X. c #4D8BBE",
-"o. c #4C8ABF",
-"O. c #4E8DC0",
-"+. c #4F8DC1",
-"@. c #508FC3",
-"#. c #5291C6",
-"$. c gray100",
-"%. c None",
-/* pixels */
-"%.%.%.%.+.} ( W I G N %.%.%.%.%.",
-"%.%.%.%...$.( R L S B %.%.%.%.%.",
-"%.%.%.%.] ( R L D B m %.%.%.%.%.",
-"%.%.o.] W L V v V B B %.%.%.%.%.",
-"#.+. .` ^ U G A m B B %.s u 7 %.",
-"@.o._ ^ R G A m m m c %.u q 1 %.",
-"o.] _ R L G B B n c %.9 q 1 * %.",
-"] _ E U m %.%.%.%.%.%.q 5 * # %.",
-"( E U n %.k z j s a t 5 * $ O %.",
-"W R K %.l x j f a t 5 * $ + X %.",
-"%.K D %.x j f a q 8 * $ + + %.%.",
-"%.%.%.%.j f a > : @ . %.%.%.",
-"%.%.%.%.f a t 5 , % + %.%.%.%.%.",
-"%.%.%.%.a t 5 < % $.O %.%.%.%.%.",
-"%.%.%.%.%.3 , % + o %.%.%.%.%.%.",
-"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%."
-};
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
deleted file mode 100644
index 1f6c0d0ce627d7..00000000000000
--- a/srcpkgs/python-tkinter/template
+++ /dev/null
@@ -1,91 +0,0 @@
-# Template file for 'python-tkinter'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
-#
-
-_desc="Interpreted, interactive, object-oriented programming language"
-
-pkgname=python-tkinter
-version=2.7.18.7
-revision=2
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-pycompile_dirs="usr/lib/python2.7/lib-tk"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel tk-devel"
-short_desc="${_desc} - GUI toolkit for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
-homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- fi
- ./configure ${configure_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
-
- mkdir -p ${wrksrc}/tmp-destdir/usr/lib
- ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
-
- make DESTDIR=${wrksrc}/tmp-destdir altinstall
-
- # We only care for the idle and tk modules.
- vmkdir usr/bin
- vmkdir usr/lib/python2.7/lib-dynload
- mv ${wrksrc}/tmp-destdir/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/idlelib \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-tk \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-dynload/_tkinter.so \
- ${DESTDIR}/usr/lib/python2.7/lib-dynload/
- ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2
-}
-
-idle-python_package() {
- short_desc="${_desc} - IDE for Python2 using Tkinter"
- pycompile_dirs="usr/lib/python2.7/idlelib"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/bin/idle2*
- vmove usr/lib/python2.7/idlelib
- vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps
- vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
- }
-}
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
From bd15ddb1ca4c427c23804bba720dec0fa25516cb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:41:55 -0400
Subject: [PATCH 36/38] python: remove
closes #38229
---
srcpkgs/python-devel | 1 -
srcpkgs/python/files/cross.patch | 88 --------------
srcpkgs/python/patches/fix-i686-rlock.patch | 55 ---------
srcpkgs/python/patches/fix-pr-21.patch | 17 ---
.../python/patches/musl-find_library.patch | 44 -------
srcpkgs/python/patches/sysconfig.patch | 22 ----
srcpkgs/python/template | 114 ------------------
srcpkgs/python/update | 1 -
srcpkgs/removed-packages/template | 14 ++-
9 files changed, 10 insertions(+), 346 deletions(-)
delete mode 120000 srcpkgs/python-devel
delete mode 100644 srcpkgs/python/files/cross.patch
delete mode 100644 srcpkgs/python/patches/fix-i686-rlock.patch
delete mode 100644 srcpkgs/python/patches/fix-pr-21.patch
delete mode 100644 srcpkgs/python/patches/musl-find_library.patch
delete mode 100644 srcpkgs/python/patches/sysconfig.patch
delete mode 100644 srcpkgs/python/template
delete mode 100644 srcpkgs/python/update
diff --git a/srcpkgs/python-devel b/srcpkgs/python-devel
deleted file mode 120000
index d8654aa0e2f2f3..00000000000000
--- a/srcpkgs/python-devel
+++ /dev/null
@@ -1 +0,0 @@
-python
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python/files/cross.patch
deleted file mode 100644
index 04a20a75dad792..00000000000000
--- a/srcpkgs/python/files/cross.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -1000,12 +1002,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- $(DESTDIR)$(LIBDEST)/distutils/tests ; \
- fi
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- $(DESTDIR)$(LIBDEST)
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-@@ -1133,11 +1135,13 @@ libainstall: all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
-+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+ --skip-build \
- --prefix=$(prefix) \
-- --install-scripts=$(BINDIR) \
-- --install-platlib=$(DESTSHARED) \
-- --root=$(DESTDIR)/
-+ --install-scripts=$(DESTDIR)$(BINDIR) \
-+ --install-platlib=$(DESTDIR)$(DESTSHARED) \
-+ --root=/
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
-
- # Here are a couple of targets for MacOSX again, to install a full
---- setup.py.orig 2013-11-10 08:36:41.000000000 +0100
-+++ setup.py 2013-11-18 21:27:27.222000786 +0100
-@@ -17,7 +17,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
- from distutils.spawn import find_executable
-
--cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-+cross_compiling = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('PYTHONXCPREFIX' in os.environ)
-
- def get_platform():
- # cross build
-@@ -324,6 +324,9 @@ class PyBuildExt(build_ext):
-
- # Don't try to load extensions for cross builds
- if cross_compiling:
-+ self.announce(
-+ 'WARNING: skipping import check for cross-compiled: "%s"' %
-+ ext.name)
- return
-
- try:
-@@ -478,7 +481,7 @@ class PyBuildExt(build_ext):
- for directory in reversed(options.dirs):
- add_dir_to_list(dir_list, directory)
-
-- if os.path.normpath(sys.prefix) != '/usr' \
-+ if os.path.normpath(sys.prefix) != '/usr' and not cross_compiling \
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
- # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
- # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-@@ -554,6 +557,11 @@ class PyBuildExt(build_ext):
- if host_platform in ['darwin', 'beos']:
- math_libs = []
-
-+ # Insert libraries and headers from XBPS_CROSS_BASE
-+ if 'XBPS_CROSS_BASE' in os.environ:
-+ lib_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/lib']
-+ inc_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/include']
-+
- # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
- #
-@@ -2020,6 +2028,11 @@ class PyBuildExt(build_ext):
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
-+ if cross_compiling:
-+ cmd = "cd %s && env CFLAGS='' '%s/configure' --host=%s --build=%s %s" \
-+ % (ffi_builddir, ffi_srcdir, os.environ.get('HOSTARCH'),
-+ os.environ.get('BUILDARCH'), " ".join(config_args))
-+ else:
- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python/patches/fix-i686-rlock.patch
deleted file mode 100644
index 94e5567bece90c..00000000000000
--- a/srcpkgs/python/patches/fix-i686-rlock.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-It seems that avoiding to create local aliases for the self._rlock and
-self._wlock methods prevents the strange errors on i686 related to
-semaphore locking and unlocking.
-
-One example of failing builds is firefox-esr running gyp in an i686 environment.
-
---- a/Lib/multiprocessing/queues.py 2017-09-16 19:38:35.000000000 +0200
-+++ b/Lib/multiprocessing/queues.py 2017-10-24 19:49:06.291351206 +0200
-@@ -369,13 +369,11 @@
-
- def _make_methods(self):
-- recv = self._reader.recv
-- racquire, rrelease = self._rlock.acquire, self._rlock.release
- def get():
-- racquire()
-- try:
-- return recv()
-- finally:
-- rrelease()
-+ self._rlock.acquire()
-+ try:
-+ return self._reader.recv()
-+ finally:
-+ self._rlock.release()
- self.get = get
-
- if self._wlock is None:
-@@ -383,11 +382,9 @@
- self.put = self._writer.send
- else:
-- send = self._writer.send
-- wacquire, wrelease = self._wlock.acquire, self._wlock.release
- def put(obj):
-- wacquire()
-- try:
-- return send(obj)
-- finally:
-- wrelease()
-+ self._wlock.acquire()
-+ try:
-+ return self._writer.send(obj)
-+ finally:
-+ self._wlock.release()
- self.put = put
---- a/Modules/_multiprocessing/semaphore.c 2017-09-16 19:38:35.000000000 +0200
-+++ b/Modules/_multiprocessing/semaphore.c 2017-10-28 10:49:56.944993401 +0200
-@@ -378,7 +378,7 @@
- }
- }
- #else
-- int sval;
-+ int sval = -1;
-
- /* This check is not an absolute guarantee that the semaphore
- does not rise above maxvalue. */
diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch
deleted file mode 100644
index e1e5b771e79a16..00000000000000
--- a/srcpkgs/python/patches/fix-pr-21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Include/pyport.h
-+++ b/Include/pyport.h
-@@ -947,7 +947,6 @@
- #define Py_ULL(x) Py_LL(x##U)
- #endif
-
--#ifdef Py_BUILD_CORE
- /*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (issue23524).
-@@ -965,6 +964,5 @@
- #define _Py_END_SUPPRESS_IPH
-
- #endif /* _MSC_VER >= 1900 */
--#endif /* Py_BUILD_CORE */
-
- #endif /* Py_PYPORT_H */
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python/patches/musl-find_library.patch
deleted file mode 100644
index 82f436b4072bd8..00000000000000
--- a/srcpkgs/python/patches/musl-find_library.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -204,6 +204,41 @@
- def find_library(name, is64 = False):
- return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
-
-+ elif True:
-+
-+ # Patched for Alpine Linux / musl - search manually system paths
-+ def _is_elf(filepath):
-+ try:
-+ with open(filepath, 'rb') as fh:
-+ return fh.read(4) == b'\x7fELF'
-+ except:
-+ return False
-+
-+ def find_library(name):
-+ from glob import glob
-+ # absolute name?
-+ if os.path.isabs(name):
-+ return name
-+ # special case for libm, libcrypt and libpthread and musl
-+ if name in ['m', 'crypt', 'pthread']:
-+ name = 'c'
-+ elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']:
-+ name = 'libc.so'
-+ # search in standard locations (musl order)
-+ paths = ['/lib', '/usr/local/lib', '/usr/lib']
-+ if 'LD_LIBRARY_PATH' in os.environ:
-+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
-+ for d in paths:
-+ f = os.path.join(d, name)
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
-+ prefix = os.path.join(d, 'lib'+name)
-+ for suffix in ['.so', '.so.*']:
-+ for f in glob('{0}{1}'.format(prefix, suffix)):
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
- else:
-
- def _findSoname_ldconfig(name):
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python/patches/sysconfig.patch
deleted file mode 100644
index 6a089a89adb4a0..00000000000000
--- a/srcpkgs/python/patches/sysconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200
-+++ b/Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100
-@@ -181,8 +171,8 @@
- _osx_support.customize_compiler(_config_vars)
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
-
-- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-- get_config_vars('CC', 'CXX', 'CFLAGS',
-+ (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-+ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
-
-@@ -206,7 +196,7 @@
- if 'LDFLAGS' in os.environ:
- ldshared = ldshared + ' ' + os.environ['LDFLAGS']
- if 'CFLAGS' in os.environ:
-- cflags = cflags + ' ' + os.environ['CFLAGS']
-+ cflags = opt + ' ' + os.environ['CFLAGS']
- ldshared = ldshared + ' ' + os.environ['CFLAGS']
- if 'CPPFLAGS' in os.environ:
- cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
deleted file mode 100644
index 99d9642e998ab4..00000000000000
--- a/srcpkgs/python/template
+++ /dev/null
@@ -1,114 +0,0 @@
-# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
-pkgname=python
-version=2.7.18.7
-revision=5
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
-homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
- fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
- make DESTDIR=${DESTDIR} altinstall
- ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
- ln -sf python2.7 ${DESTDIR}/usr/bin/python2
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
- ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
- ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
- chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/smtpd.py
- mv ${DESTDIR}/usr/bin/2to3{,-2.7}
- mv ${DESTDIR}/usr/bin/pydoc{,2.7}
- # Remove files that belong to python-tkinter and idle-python
- rm ${DESTDIR}/usr/bin/idle
- rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
- rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
- # Remove test module and tests that fail to be byte-compiled.
- rm -r ${DESTDIR}/usr/lib/python2.7/test
- rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
- # Remove references to the install(1) wrapper.
- vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- if [ "$CROSS_BUILD" ]; then
- # Remove references to cross toolchain.
- vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- fi
-}
-
-python-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/python*-config
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove usr/lib/python2.7/config/libpython2.7.a
- mkdir -p ${DESTDIR}/usr/include/python2.7
- mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
- ${DESTDIR}/usr/include/python2.7
- }
-}
diff --git a/srcpkgs/python/update b/srcpkgs/python/update
deleted file mode 100644
index cfb8828f7e490a..00000000000000
--- a/srcpkgs/python/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='v\K2\.7\.[\d.]*\d'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c8ea52100bc2d3..e14c508061fd98 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -286,6 +286,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ idle-python<=2.7.18.7_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
@@ -331,6 +332,8 @@ replaces="
libbitcoin-server<=3.6.0_10
libbitcoin-system-devel<=3.6.0_10
libbitcoin-system<=3.6.0_10
+ libclang-32bit<=15.0.7_3
+ libclang-cpp-32bit<=15.0.7_3
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
@@ -403,6 +406,8 @@ replaces="
libzapojit<=0.0.3_10
litecoin<=0.18.1_11
livewallpaper<=0.5.0_2
+ lld-devel<=15.0.7_3
+ lldb-devel<=15.0.7_3
llvm10<=10.0.0_8
llvm11<=11.0.0_2
llvm3.9<=3.9.1_5
@@ -549,6 +554,7 @@ replaces="
python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
python-decorator<=4.4.2_2
+ python-devel<=2.7.18.7_4
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
@@ -586,6 +592,7 @@ replaces="
python-pathlib2<=2.3.4_6
python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
+ python-pip<=20.3.4_1
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
python-ply<=3.11_7
@@ -611,12 +618,14 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-service_identity<=18.1.0_7
+ python-setuptools<=44.0.0_2
python-six<=1.16.0_3
python-spambayes<=1.1b3_3
python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
python-sqlparse<=0.3.0_6
python-tempita<=0.5.2_8
+ python-tkinter<=2.7.18.7_2
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -658,6 +667,7 @@ replaces="
python3-sqlalchemy-migrate<=0.12.0_6
python3-stormssh<=0.7.0_7
python3-txacme<=0.9.3_3
+ python<=2.7.18.7_4
qimageblitz<=0.0.6_4
qt-designer-devel<=4.8.7_29
qt-designer-libs<=4.8.7_29
@@ -760,10 +770,6 @@ replaces="
zou<=0.2.0_7
zuluplay-devel<=1.1_1
zuluplay<=1.1_1
- lldb-devel<=15.0.7_3
- lld-devel<=15.0.7_3
- libclang-32bit<=15.0.7_3
- libclang-cpp-32bit<=15.0.7_3
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 33b82a751887a6d99d254b7a1f37be67e64a9695 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 37/38] Manual.md: remove python 2 documentation
---
Manual.md | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Manual.md b/Manual.md
index 34c737e6df427d..156ac3bb78a7fa 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
language prefix can be dropped. Short names for languages are no valid substitute
for the language prefix.
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
<a id="language_bindings"></a>
#### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
<name>-<language>
```
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
<a id="programs"></a>
#### Programs
@@ -592,9 +592,9 @@ build methods. By default set to `check`.
- `make_install_target` The installation target. When `${build_style}` is set to `configure`,
`gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
current directory with respect to the install.
- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1039,8 +1039,6 @@ Additional install arguments can be specified via `make_install_args`.
- `waf3` For packages that use the Python3 `waf` build method with python3.
-- `waf` For packages that use the Python `waf` method with python2.
-
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
@@ -1069,8 +1067,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python2-module` to build Python 2.x modules
-
- `python3-module` to build Python 3.x modules
- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1589,7 +1585,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
<a id="pkgs_python"></a>
#### Python packages
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
This sets some environment variables required to allow cross compilation. Support to allow
building a python module for multiple versions from a single template is also possible.
The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1614,7 +1610,7 @@ The following variables may influence how the python packages are built and conf
at post-install time:
- `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
at install time as python modules. This variable expects subset of them that
should be byte-compiled, if default is wrong. Multiple python modules may be specified separated
by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into
@@ -1635,10 +1631,6 @@ Also, a set of useful variables are defined to use in the templates:
| Variable | Value |
|-------------|----------------------------------|
-| py2_ver | 2.X |
-| py2_lib | usr/lib/python2.X |
-| py2_sitelib | usr/lib/python2.X/site-packages |
-| py2_inc | usr/include/python2.X |
| py3_ver | 3.X |
| py3_lib | usr/lib/python3.X |
| py3_sitelib | usr/lib/python3.X/site-packages |
From 5980b09fbe269010c8cc4f395bc58f03aafcc743 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:35:04 -0400
Subject: [PATCH 38/38] common: remove python 2-specific code
---
common/build-style/python2-module.sh | 34 -------------------
common/build-style/waf.sh | 21 ------------
common/environment/setup/python.sh | 5 ---
.../04-create-xbps-metadata-scripts.sh | 2 --
4 files changed, 62 deletions(-)
delete mode 100644 common/build-style/python2-module.sh
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/python2-module.sh b/common/build-style/python2-module.sh
deleted file mode 100644
index 0a31b157dfc2f3..00000000000000
--- a/common/build-style/python2-module.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This helper is for templates installing python2-only modules.
-#
-
-do_build() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py build ${make_build_args}
- else
- python2 setup.py build ${make_build_args}
- fi
-}
-
-do_install() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py \
- install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- else
- python2 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- fi
-}
diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
- --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ab5c47d52847b1..0aa40f908f8827 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,11 +2,6 @@
# Useful variables for determining Python version and paths.
#
-py2_ver="2.7"
-py2_lib="usr/lib/python${py2_ver}"
-py2_sitelib="${py2_lib}/site-packages"
-py2_inc="usr/include/python${py2_ver}"
-
py3_ver="3.12"
py3_abiver=""
py3_lib="usr/lib/python${py3_ver}"
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 69e318a560819e..dee6832c6a8057 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -278,8 +278,6 @@ _EOF
if [ "$pycompile_version" = 3 ]; then
pycompile_version=${py3_ver}
- elif [ "$pycompile_version" = 2 ]; then
- pycompile_version=${py2_ver}
fi
if [ -n "${pycompile_dirs}" -o -n "${pycompile_module}" ]; then
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (25 preceding siblings ...)
2024-04-18 0:18 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-27 19:17 ` leahneukirchen
2024-09-28 8:57 ` [PR PATCH] [Updated] " classabbyamp
` (5 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: leahneukirchen @ 2024-09-27 19:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-2379909878
Comment:
I'll adopt and maintain python, python-tkinter, python-setuptools, python-pip, so please don't remove them.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (26 preceding siblings ...)
2024-09-27 19:17 ` leahneukirchen
@ 2024-09-28 8:57 ` classabbyamp
2024-09-28 9:01 ` classabbyamp
` (4 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-28 8:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 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, python 2: 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.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
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: 75628 bytes --]
From a9b55b490cd8ae8d5855d18dfc8a45bc7903d2c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/37] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a864..00000000000000
--- 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 ae905fc67ab834..00000000000000
--- 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 aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 1774b5da0e4eb367903c2293abdab4ce97b5f8e5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/37] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd9..00000000000000
--- 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 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From d772294150ebbf7bf6a99dc085ceb30af1643ec1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/37] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From a5a69a290ecb6e1490a750e6a93c742ad157390a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/37] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From 57ffbc5dc98f39d38d4378e8f64d220801c69fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/37] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c7..00000000000000
--- 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 cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From 6390c9686a55bdcf1916db28302f670b06415e4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/37] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From c1233165bf03c0e53b8b01b480cc93a0b2de7252 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/37] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From b52cc9f44ff91b8fc6f8b4af81ec393b1ca1c555 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/37] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From 967f3a826e5e329544aec628e322178fedb25395 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/37] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From 8c6006ac4c3f3a8bd2f9378be1cc5b96f564d21c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/37] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1f..00000000000000
--- 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)"
From ccfa687aada3c7a09096368bc2af4cce6d71dfe0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/37] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From e5dc7e2926ac2a7db1ee4082a70828dd755ae7b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/37] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930e..00000000000000
--- 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 0ffe8186a9433a..00000000000000
--- 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 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From f460523da5706cf1780c63f738237e28004f5430 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/37] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From 8974e77d5b00859f68f48490964a26013f1a6efa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/37] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From 329a2f4d8ecec2cb4ef9e06ad30b418d5785574d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/37] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From c30f92e186d30ff53dbd4f6f4a58a3aad9b02107 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/37] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From 47c351b646f9a29a60e0634e00d4f7d0cd485c53 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/37] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From 3266fd232a7c281c62da9348acddc0e6f41396ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/37] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From e0540edfc21fa447ffb9d75c605b935046527f38 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/37] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From 96455e8bbb9b6889a11b76e5d7fdb77a0515ff58 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/37] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 0ca93a6491e30d94eb5c1c82dde92d7116e897d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/37] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 42bf496be0d8bc7de9894edab13e812ddfc8c5aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/37] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From a44930620fc80c0a30f2d0fb4d209fad6777be34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/37] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83d..00000000000000
--- 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)"
From 2482abf5420422de4b352c4212f48a50d7c42587 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/37] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From 4e8b8891bca37b50dcfb502b23b4b7413be8a626 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/37] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 24 ------------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 683db6c7b96794..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-reverts="1.16.0_1"
-version=1.15.1
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From ca11147ddfe966764bce32c26a45f74f8e410fea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/37] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From 8d0ab0d6684712e7ff0fcf238c244800918f093b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/37] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From bb291d67c17572118015e4772f996823e3e2e3f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/37] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From fcb0c3fe4b51ad0e4783c0e63e737d773096ef06 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/37] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 8096d69e6ebb7c03e7c3ae1a149d00dd5183dfed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/37] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 59b614f873a304dd2aab68c527cb6e05ae95238a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/37] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From 8ca306d30c0104762e1aa9a5e81bdabcffd6241c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/37] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 51b665f01c180e..d112938291237a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -49,6 +49,8 @@ replaces="
bluez-qt5<=5.115.0_1
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -574,29 +576,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -604,8 +619,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -620,14 +639,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -644,8 +669,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -654,6 +684,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-Flask-Assets<=0.12_9
python3-Flask-Mail<=0.9.1_5
From 1431c9026d9f1950a209a1201562dc294975c1bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 33/37] Manual.md: remove unnecessary python 2 documentation
---
Manual.md | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Manual.md b/Manual.md
index a8d19d1439dda1..6d9a0e6289fd71 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
language prefix can be dropped. Short names for languages are no valid substitute
for the language prefix.
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
<a id="language_bindings"></a>
#### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
<name>-<language>
```
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
<a id="programs"></a>
#### Programs
@@ -597,9 +597,9 @@ build methods. By default set to `check`.
- `make_install_target` The installation target. When `${build_style}` is set to `configure`,
`gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
current directory with respect to the install.
- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1047,8 +1047,6 @@ Additional install arguments can be specified via `make_install_args`.
- `waf3` For packages that use the Python3 `waf` build method with python3.
-- `waf` For packages that use the Python `waf` method with python2.
-
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
@@ -1077,8 +1075,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python2-module` to build Python 2.x modules
-
- `python3-module` to build Python 3.x modules
- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1599,7 +1595,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
<a id="pkgs_python"></a>
#### Python packages
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
This sets some environment variables required to allow cross compilation. Support to allow
building a python module for multiple versions from a single template is also possible.
The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1624,7 +1620,7 @@ The following variables may influence how the python packages are built and conf
at post-install time:
- `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
at install time as python modules. This variable expects subset of them that
should be byte-compiled, if default is wrong. Multiple python modules may be specified separated
by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into
From 8eee17448f593c8f2e10c35c1f7f675dab6f3acd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:21:57 -0400
Subject: [PATCH 34/37] common/build-style: remove waf build style
no longer needed by any packages, and should not ever be needed by any
new packages
---
common/build-style/waf.sh | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
- --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}
From 5b1ca818396d602da0981093b0c1a98a0caad832 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:36:54 -0400
Subject: [PATCH 35/37] python-pip: rename to python2-pip
adopted by Leah at her request
---
srcpkgs/python-pip | 1 +
.../patches/no-versioned-pip.patch | 0
srcpkgs/{python-pip => python2-pip}/template | 18 ++++++++++++------
srcpkgs/{python-pip => python2-pip}/update | 0
4 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-pip
rename srcpkgs/{python-pip => python2-pip}/patches/no-versioned-pip.patch (100%)
rename srcpkgs/{python-pip => python2-pip}/template (58%)
rename srcpkgs/{python-pip => python2-pip}/update (100%)
diff --git a/srcpkgs/python-pip b/srcpkgs/python-pip
new file mode 120000
index 00000000000000..c63a33926675c8
--- /dev/null
+++ b/srcpkgs/python-pip
@@ -0,0 +1 @@
+python2-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python2-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python2-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python2-pip/template
similarity index 58%
rename from srcpkgs/python-pip/template
rename to srcpkgs/python2-pip/template
index 00d8875f2f9e2a..c3955779cd7c31 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python2-pip/template
@@ -1,12 +1,12 @@
-# Template file for 'python-pip'
-pkgname=python-pip
+# Template file for 'python2-pip'
+pkgname=python2-pip
version=20.3.4
-revision=1
+revision=2
build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
+hostmakedepends="python2-setuptools"
+depends="python2-setuptools"
short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
@@ -17,3 +17,9 @@ post_install() {
vlicense LICENSE.txt
mv ${DESTDIR}/usr/bin/pip{,2}
}
+
+python-pip_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python2-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python2-pip/update
From 2497ab964d9db2bd1e156597bf0fa8dde0650d6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:38:37 -0400
Subject: [PATCH 36/37] python-setuptools: rename to python2-setuptools
adopted by Leah at her request
---
srcpkgs/python-setuptools | 1 +
.../template | 18 ++++++++++++------
.../update | 0
3 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-setuptools
rename srcpkgs/{python-setuptools => python2-setuptools}/template (70%)
rename srcpkgs/{python-setuptools => python2-setuptools}/update (100%)
diff --git a/srcpkgs/python-setuptools b/srcpkgs/python-setuptools
new file mode 120000
index 00000000000000..05923bd3cc80b0
--- /dev/null
+++ b/srcpkgs/python-setuptools
@@ -0,0 +1 @@
+python2-setuptools
\ No newline at end of file
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python2-setuptools/template
similarity index 70%
rename from srcpkgs/python-setuptools/template
rename to srcpkgs/python2-setuptools/template
index 5c5faa52fec451..a3c18827a7ecd0 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python2-setuptools/template
@@ -1,14 +1,14 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
+# Template file for 'python2-setuptools'
+pkgname=python2-setuptools
# https://github.com/pypa/setuptools/issues/1458
# python2 support for setuptools ended at 44.0.0
version=44.0.0
-revision=2
+revision=3
build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
+hostmakedepends="python2-devel"
+depends="python2"
short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/pypa/setuptools"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
@@ -24,3 +24,9 @@ post_install() {
vlicense LICENSE
mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
}
+
+python-setuptools_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python2-setuptools/update
similarity index 100%
rename from srcpkgs/python-setuptools/update
rename to srcpkgs/python2-setuptools/update
From d8674878462d4ce35d5e24c8185e693c3460e684 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:39:10 -0400
Subject: [PATCH 37/37] python: rename to python2, convert to metapackage
metapackage points at 2.7 for now, but will change at a later date
closes #38229
---
srcpkgs/python-tkinter/update | 1 -
srcpkgs/python/INSTALL.msg | 2 +
srcpkgs/python/template | 116 ++----------------
srcpkgs/python2-devel | 1 +
.../files/cross.patch | 0
.../files/idle2.desktop | 0
.../files/idle2.xpm | 0
.../template | 8 +-
srcpkgs/python2-tkinter/update | 1 +
srcpkgs/{python => python2}/files/cross.patch | 0
.../patches/fix-i686-rlock.patch | 0
.../patches/musl-find_library.patch | 0
.../patches/sysconfig.patch | 0
srcpkgs/python2/template | 116 ++++++++++++++++++
srcpkgs/{python => python2}/update | 0
15 files changed, 133 insertions(+), 112 deletions(-)
delete mode 120000 srcpkgs/python-tkinter/update
create mode 100644 srcpkgs/python/INSTALL.msg
create mode 120000 srcpkgs/python2-devel
rename srcpkgs/{python-tkinter => python2-tkinter}/files/cross.patch (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.desktop (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.xpm (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/template (92%)
create mode 120000 srcpkgs/python2-tkinter/update
rename srcpkgs/{python => python2}/files/cross.patch (100%)
rename srcpkgs/{python => python2}/patches/fix-i686-rlock.patch (100%)
rename srcpkgs/{python => python2}/patches/musl-find_library.patch (100%)
rename srcpkgs/{python => python2}/patches/sysconfig.patch (100%)
create mode 100644 srcpkgs/python2/template
rename srcpkgs/{python => python2}/update (100%)
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
diff --git a/srcpkgs/python/INSTALL.msg b/srcpkgs/python/INSTALL.msg
new file mode 100644
index 00000000000000..c601330e59e94d
--- /dev/null
+++ b/srcpkgs/python/INSTALL.msg
@@ -0,0 +1,2 @@
+This package will install python3 soon. If you wish to keep Python 2,
+mark python2 as manually installed with xbps-pkgdb(1).
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 57e2d76db0a905..c7d9066c75813b 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,114 +1,16 @@
# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
pkgname=python
-version=2.7.18.9
-revision=2
-_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
+version=2.7.9999
+revision=1
+build_style=meta
+depends="python${version%%.*}"
+short_desc="Python programming language (metapackage)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat and libffi are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
- fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
- make DESTDIR=${DESTDIR} altinstall
- ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
- ln -sf python2.7 ${DESTDIR}/usr/bin/python2
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
- ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
- ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
- chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/smtpd.py
- mv ${DESTDIR}/usr/bin/2to3{,-2.7}
- mv ${DESTDIR}/usr/bin/pydoc{,2.7}
- # Remove files that belong to python-tkinter and idle-python
- rm ${DESTDIR}/usr/bin/idle
- rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
- rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
- # Remove test module and tests that fail to be byte-compiled.
- rm -r ${DESTDIR}/usr/lib/python2.7/test
- rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
- # Remove references to the install(1) wrapper.
- vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- if [ "$CROSS_BUILD" ]; then
- # Remove references to cross toolchain.
- vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- fi
-}
python-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="python${version%%.*}-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/python*-config
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove usr/lib/python2.7/config/libpython2.7.a
- mkdir -p ${DESTDIR}/usr/include/python2.7
- mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
- ${DESTDIR}/usr/include/python2.7
- }
+ build_style=meta
}
diff --git a/srcpkgs/python2-devel b/srcpkgs/python2-devel
new file mode 120000
index 00000000000000..551ab268585033
--- /dev/null
+++ b/srcpkgs/python2-devel
@@ -0,0 +1 @@
+python2
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python2-tkinter/files/cross.patch
similarity index 100%
rename from srcpkgs/python-tkinter/files/cross.patch
rename to srcpkgs/python2-tkinter/files/cross.patch
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python2-tkinter/files/idle2.desktop
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.desktop
rename to srcpkgs/python2-tkinter/files/idle2.desktop
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python2-tkinter/files/idle2.xpm
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.xpm
rename to srcpkgs/python2-tkinter/files/idle2.xpm
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python2-tkinter/template
similarity index 92%
rename from srcpkgs/python-tkinter/template
rename to srcpkgs/python2-tkinter/template
index 37f263262aa4e0..75de19834d0a0d 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python2-tkinter/template
@@ -1,12 +1,12 @@
-# Template file for 'python-tkinter'
+# Template file for 'python2-tkinter'
#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: python2 -> tk -> libX11 -> libxcb -> xcb-proto -> python2
#
_desc="Interpreted, interactive, object-oriented programming language"
-pkgname=python-tkinter
+pkgname=python2-tkinter
version=2.7.18.9
revision=2
_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
diff --git a/srcpkgs/python2-tkinter/update b/srcpkgs/python2-tkinter/update
new file mode 120000
index 00000000000000..b29540d8f73a12
--- /dev/null
+++ b/srcpkgs/python2-tkinter/update
@@ -0,0 +1 @@
+../python2/update
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python2/files/cross.patch
similarity index 100%
rename from srcpkgs/python/files/cross.patch
rename to srcpkgs/python2/files/cross.patch
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python2/patches/fix-i686-rlock.patch
similarity index 100%
rename from srcpkgs/python/patches/fix-i686-rlock.patch
rename to srcpkgs/python2/patches/fix-i686-rlock.patch
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python2/patches/musl-find_library.patch
similarity index 100%
rename from srcpkgs/python/patches/musl-find_library.patch
rename to srcpkgs/python2/patches/musl-find_library.patch
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python2/patches/sysconfig.patch
similarity index 100%
rename from srcpkgs/python/patches/sysconfig.patch
rename to srcpkgs/python2/patches/sysconfig.patch
diff --git a/srcpkgs/python2/template b/srcpkgs/python2/template
new file mode 100644
index 00000000000000..4d2b2336cdc91d
--- /dev/null
+++ b/srcpkgs/python2/template
@@ -0,0 +1,116 @@
+# Template file for 'python2'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2-tkinter".
+#
+pkgname=python2
+version=2.7.18.9
+revision=2
+_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
+pycompile_dirs="usr/lib/python2.7"
+hostmakedepends="pkg-config"
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
+ sqlite-devel bzip2-devel zlib-devel"
+depends="ca-certificates"
+short_desc="Interpreted, interactive, object-oriented programming language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Python-2.0"
+homepage="https://www.python.org"
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
+
+short_desc+=" (limited install; not for regular use)"
+
+alternatives="
+ python:idle:/usr/bin/idle2.7
+ python:2to3:/usr/bin/2to3-2.7
+ python:pydoc:/usr/bin/pydoc2.7
+ python:python:/usr/bin/python2.7
+ python:python.1:/usr/share/man/man1/python2.7.1"
+
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libxcrypt-devel"
+fi
+
+pre_configure() {
+ # Ensure that internal copies of expat and libffi are not used.
+ rm -r Modules/expat
+ rm -r Modules/_ctypes/libffi*
+ # Enable loading sqlite extensions.
+ vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
+}
+
+do_configure() {
+ local _args
+ unset GCC CC CXX CPP LD AR AS RANLIB
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p host-build
+ cd host-build
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
+ mkdir -p ../hostpython
+ mv python ../hostpython
+ cd ..
+ patch -Np0 -i ${FILESDIR}/cross.patch
+ _args="--build=${XBPS_MACHINE%%-musl}"
+ fi
+ ./configure ${configure_args} ${_args} \
+ --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+ --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
+ --with-system-expat --with-system-ffi --without-ensurepip
+}
+
+do_build() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
+ make ${makejobs}
+}
+
+do_install() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ make DESTDIR=${DESTDIR} altinstall
+ ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
+ ln -sf python2.7 ${DESTDIR}/usr/bin/python2
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
+ ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
+ ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
+}
+
+post_install() {
+ chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
+ vlicense LICENSE
+ rm -f ${DESTDIR}/usr/bin/smtpd.py
+ mv ${DESTDIR}/usr/bin/2to3{,-2.7}
+ mv ${DESTDIR}/usr/bin/pydoc{,2.7}
+ # Remove files that belong to python-tkinter and idle-python
+ rm ${DESTDIR}/usr/bin/idle
+ rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
+ # Remove test module and tests that fail to be byte-compiled.
+ rm -r ${DESTDIR}/usr/lib/python2.7/test
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
+ # Remove references to the install(1) wrapper.
+ vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ if [ "$CROSS_BUILD" ]; then
+ # Remove references to cross toolchain.
+ vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ fi
+}
+
+python2-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/python*-config
+ vmove usr/lib/pkgconfig
+ vmove usr/include
+ vmove usr/lib/python2.7/config/libpython2.7.a
+ mkdir -p ${DESTDIR}/usr/include/python2.7
+ mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
+ ${DESTDIR}/usr/include/python2.7
+ }
+}
diff --git a/srcpkgs/python/update b/srcpkgs/python2/update
similarity index 100%
rename from srcpkgs/python/update
rename to srcpkgs/python2/update
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (27 preceding siblings ...)
2024-09-28 8:57 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-28 9:01 ` classabbyamp
2024-09-28 9:02 ` classabbyamp
` (3 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-28 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 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, python 2: 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.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
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: 76209 bytes --]
From a9b55b490cd8ae8d5855d18dfc8a45bc7903d2c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/37] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a864..00000000000000
--- 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 ae905fc67ab834..00000000000000
--- 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 aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 1774b5da0e4eb367903c2293abdab4ce97b5f8e5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/37] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd9..00000000000000
--- 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 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From d772294150ebbf7bf6a99dc085ceb30af1643ec1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/37] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From a5a69a290ecb6e1490a750e6a93c742ad157390a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/37] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From 57ffbc5dc98f39d38d4378e8f64d220801c69fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/37] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c7..00000000000000
--- 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 cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From 6390c9686a55bdcf1916db28302f670b06415e4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/37] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From c1233165bf03c0e53b8b01b480cc93a0b2de7252 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/37] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From b52cc9f44ff91b8fc6f8b4af81ec393b1ca1c555 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/37] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From 967f3a826e5e329544aec628e322178fedb25395 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/37] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From 8c6006ac4c3f3a8bd2f9378be1cc5b96f564d21c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/37] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1f..00000000000000
--- 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)"
From ccfa687aada3c7a09096368bc2af4cce6d71dfe0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/37] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From e5dc7e2926ac2a7db1ee4082a70828dd755ae7b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/37] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930e..00000000000000
--- 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 0ffe8186a9433a..00000000000000
--- 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 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From f460523da5706cf1780c63f738237e28004f5430 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/37] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From 8974e77d5b00859f68f48490964a26013f1a6efa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/37] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From 329a2f4d8ecec2cb4ef9e06ad30b418d5785574d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/37] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From c30f92e186d30ff53dbd4f6f4a58a3aad9b02107 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/37] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From 47c351b646f9a29a60e0634e00d4f7d0cd485c53 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/37] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From 3266fd232a7c281c62da9348acddc0e6f41396ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/37] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From e0540edfc21fa447ffb9d75c605b935046527f38 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/37] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From 96455e8bbb9b6889a11b76e5d7fdb77a0515ff58 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/37] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 0ca93a6491e30d94eb5c1c82dde92d7116e897d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/37] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 42bf496be0d8bc7de9894edab13e812ddfc8c5aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/37] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From a44930620fc80c0a30f2d0fb4d209fad6777be34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/37] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83d..00000000000000
--- 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)"
From 2482abf5420422de4b352c4212f48a50d7c42587 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/37] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From 4e8b8891bca37b50dcfb502b23b4b7413be8a626 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/37] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 24 ------------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 683db6c7b96794..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-reverts="1.16.0_1"
-version=1.15.1
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From ca11147ddfe966764bce32c26a45f74f8e410fea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/37] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From 8d0ab0d6684712e7ff0fcf238c244800918f093b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/37] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From bb291d67c17572118015e4772f996823e3e2e3f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/37] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From fcb0c3fe4b51ad0e4783c0e63e737d773096ef06 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/37] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 8096d69e6ebb7c03e7c3ae1a149d00dd5183dfed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/37] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 59b614f873a304dd2aab68c527cb6e05ae95238a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/37] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From 8ca306d30c0104762e1aa9a5e81bdabcffd6241c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/37] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 51b665f01c180e..d112938291237a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -49,6 +49,8 @@ replaces="
bluez-qt5<=5.115.0_1
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -574,29 +576,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -604,8 +619,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -620,14 +639,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -644,8 +669,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -654,6 +684,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-Flask-Assets<=0.12_9
python3-Flask-Mail<=0.9.1_5
From 1431c9026d9f1950a209a1201562dc294975c1bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 33/37] Manual.md: remove unnecessary python 2 documentation
---
Manual.md | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Manual.md b/Manual.md
index a8d19d1439dda1..6d9a0e6289fd71 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
language prefix can be dropped. Short names for languages are no valid substitute
for the language prefix.
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
<a id="language_bindings"></a>
#### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
<name>-<language>
```
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
<a id="programs"></a>
#### Programs
@@ -597,9 +597,9 @@ build methods. By default set to `check`.
- `make_install_target` The installation target. When `${build_style}` is set to `configure`,
`gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
current directory with respect to the install.
- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1047,8 +1047,6 @@ Additional install arguments can be specified via `make_install_args`.
- `waf3` For packages that use the Python3 `waf` build method with python3.
-- `waf` For packages that use the Python `waf` method with python2.
-
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
@@ -1077,8 +1075,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python2-module` to build Python 2.x modules
-
- `python3-module` to build Python 3.x modules
- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1599,7 +1595,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
<a id="pkgs_python"></a>
#### Python packages
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
This sets some environment variables required to allow cross compilation. Support to allow
building a python module for multiple versions from a single template is also possible.
The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1624,7 +1620,7 @@ The following variables may influence how the python packages are built and conf
at post-install time:
- `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
at install time as python modules. This variable expects subset of them that
should be byte-compiled, if default is wrong. Multiple python modules may be specified separated
by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into
From 8eee17448f593c8f2e10c35c1f7f675dab6f3acd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:21:57 -0400
Subject: [PATCH 34/37] common/build-style: remove waf build style
no longer needed by any packages, and should not ever be needed by any
new packages
---
common/build-style/waf.sh | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
- --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}
From 5b1ca818396d602da0981093b0c1a98a0caad832 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:36:54 -0400
Subject: [PATCH 35/37] python-pip: rename to python2-pip
adopted by Leah at her request
---
srcpkgs/python-pip | 1 +
.../patches/no-versioned-pip.patch | 0
srcpkgs/{python-pip => python2-pip}/template | 18 ++++++++++++------
srcpkgs/{python-pip => python2-pip}/update | 0
4 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-pip
rename srcpkgs/{python-pip => python2-pip}/patches/no-versioned-pip.patch (100%)
rename srcpkgs/{python-pip => python2-pip}/template (58%)
rename srcpkgs/{python-pip => python2-pip}/update (100%)
diff --git a/srcpkgs/python-pip b/srcpkgs/python-pip
new file mode 120000
index 00000000000000..c63a33926675c8
--- /dev/null
+++ b/srcpkgs/python-pip
@@ -0,0 +1 @@
+python2-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python2-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python2-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python2-pip/template
similarity index 58%
rename from srcpkgs/python-pip/template
rename to srcpkgs/python2-pip/template
index 00d8875f2f9e2a..c3955779cd7c31 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python2-pip/template
@@ -1,12 +1,12 @@
-# Template file for 'python-pip'
-pkgname=python-pip
+# Template file for 'python2-pip'
+pkgname=python2-pip
version=20.3.4
-revision=1
+revision=2
build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
+hostmakedepends="python2-setuptools"
+depends="python2-setuptools"
short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
@@ -17,3 +17,9 @@ post_install() {
vlicense LICENSE.txt
mv ${DESTDIR}/usr/bin/pip{,2}
}
+
+python-pip_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python2-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python2-pip/update
From 2497ab964d9db2bd1e156597bf0fa8dde0650d6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:38:37 -0400
Subject: [PATCH 36/37] python-setuptools: rename to python2-setuptools
adopted by Leah at her request
---
srcpkgs/python-setuptools | 1 +
.../template | 18 ++++++++++++------
.../update | 0
3 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-setuptools
rename srcpkgs/{python-setuptools => python2-setuptools}/template (70%)
rename srcpkgs/{python-setuptools => python2-setuptools}/update (100%)
diff --git a/srcpkgs/python-setuptools b/srcpkgs/python-setuptools
new file mode 120000
index 00000000000000..05923bd3cc80b0
--- /dev/null
+++ b/srcpkgs/python-setuptools
@@ -0,0 +1 @@
+python2-setuptools
\ No newline at end of file
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python2-setuptools/template
similarity index 70%
rename from srcpkgs/python-setuptools/template
rename to srcpkgs/python2-setuptools/template
index 5c5faa52fec451..a3c18827a7ecd0 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python2-setuptools/template
@@ -1,14 +1,14 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
+# Template file for 'python2-setuptools'
+pkgname=python2-setuptools
# https://github.com/pypa/setuptools/issues/1458
# python2 support for setuptools ended at 44.0.0
version=44.0.0
-revision=2
+revision=3
build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
+hostmakedepends="python2-devel"
+depends="python2"
short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/pypa/setuptools"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
@@ -24,3 +24,9 @@ post_install() {
vlicense LICENSE
mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
}
+
+python-setuptools_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python2-setuptools/update
similarity index 100%
rename from srcpkgs/python-setuptools/update
rename to srcpkgs/python2-setuptools/update
From e84d171f24a1c0836f175f0976cc5d82e2e62107 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:39:10 -0400
Subject: [PATCH 37/37] python: rename to python2, convert to metapackage
metapackage points at 2.7 for now, but will change at a later date
closes #38229
---
srcpkgs/python-tkinter | 1 +
srcpkgs/python-tkinter/update | 1 -
srcpkgs/python/INSTALL.msg | 2 +
srcpkgs/python/template | 116 ++----------------
srcpkgs/python2-devel | 1 +
.../files/cross.patch | 0
.../files/idle2.desktop | 0
.../files/idle2.xpm | 0
.../template | 14 ++-
srcpkgs/python2-tkinter/update | 1 +
srcpkgs/{python => python2}/files/cross.patch | 0
.../patches/fix-i686-rlock.patch | 0
.../patches/musl-find_library.patch | 0
.../patches/sysconfig.patch | 0
srcpkgs/python2/template | 116 ++++++++++++++++++
srcpkgs/{python => python2}/update | 0
16 files changed, 140 insertions(+), 112 deletions(-)
create mode 120000 srcpkgs/python-tkinter
delete mode 120000 srcpkgs/python-tkinter/update
create mode 100644 srcpkgs/python/INSTALL.msg
create mode 120000 srcpkgs/python2-devel
rename srcpkgs/{python-tkinter => python2-tkinter}/files/cross.patch (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.desktop (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.xpm (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/template (88%)
create mode 120000 srcpkgs/python2-tkinter/update
rename srcpkgs/{python => python2}/files/cross.patch (100%)
rename srcpkgs/{python => python2}/patches/fix-i686-rlock.patch (100%)
rename srcpkgs/{python => python2}/patches/musl-find_library.patch (100%)
rename srcpkgs/{python => python2}/patches/sysconfig.patch (100%)
create mode 100644 srcpkgs/python2/template
rename srcpkgs/{python => python2}/update (100%)
diff --git a/srcpkgs/python-tkinter b/srcpkgs/python-tkinter
new file mode 120000
index 00000000000000..5e2384079e0e4d
--- /dev/null
+++ b/srcpkgs/python-tkinter
@@ -0,0 +1 @@
+python2-tkinter
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
diff --git a/srcpkgs/python/INSTALL.msg b/srcpkgs/python/INSTALL.msg
new file mode 100644
index 00000000000000..c601330e59e94d
--- /dev/null
+++ b/srcpkgs/python/INSTALL.msg
@@ -0,0 +1,2 @@
+This package will install python3 soon. If you wish to keep Python 2,
+mark python2 as manually installed with xbps-pkgdb(1).
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 57e2d76db0a905..c7d9066c75813b 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,114 +1,16 @@
# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
pkgname=python
-version=2.7.18.9
-revision=2
-_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
+version=2.7.9999
+revision=1
+build_style=meta
+depends="python${version%%.*}"
+short_desc="Python programming language (metapackage)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat and libffi are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
- fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
- make DESTDIR=${DESTDIR} altinstall
- ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
- ln -sf python2.7 ${DESTDIR}/usr/bin/python2
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
- ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
- ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
- chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/smtpd.py
- mv ${DESTDIR}/usr/bin/2to3{,-2.7}
- mv ${DESTDIR}/usr/bin/pydoc{,2.7}
- # Remove files that belong to python-tkinter and idle-python
- rm ${DESTDIR}/usr/bin/idle
- rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
- rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
- # Remove test module and tests that fail to be byte-compiled.
- rm -r ${DESTDIR}/usr/lib/python2.7/test
- rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
- # Remove references to the install(1) wrapper.
- vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- if [ "$CROSS_BUILD" ]; then
- # Remove references to cross toolchain.
- vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- fi
-}
python-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="python${version%%.*}-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/python*-config
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove usr/lib/python2.7/config/libpython2.7.a
- mkdir -p ${DESTDIR}/usr/include/python2.7
- mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
- ${DESTDIR}/usr/include/python2.7
- }
+ build_style=meta
}
diff --git a/srcpkgs/python2-devel b/srcpkgs/python2-devel
new file mode 120000
index 00000000000000..551ab268585033
--- /dev/null
+++ b/srcpkgs/python2-devel
@@ -0,0 +1 @@
+python2
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python2-tkinter/files/cross.patch
similarity index 100%
rename from srcpkgs/python-tkinter/files/cross.patch
rename to srcpkgs/python2-tkinter/files/cross.patch
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python2-tkinter/files/idle2.desktop
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.desktop
rename to srcpkgs/python2-tkinter/files/idle2.desktop
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python2-tkinter/files/idle2.xpm
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.xpm
rename to srcpkgs/python2-tkinter/files/idle2.xpm
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python2-tkinter/template
similarity index 88%
rename from srcpkgs/python-tkinter/template
rename to srcpkgs/python2-tkinter/template
index 37f263262aa4e0..f527446cf655d5 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python2-tkinter/template
@@ -1,12 +1,12 @@
-# Template file for 'python-tkinter'
+# Template file for 'python2-tkinter'
#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: python2 -> tk -> libX11 -> libxcb -> xcb-proto -> python2
#
_desc="Interpreted, interactive, object-oriented programming language"
-pkgname=python-tkinter
+pkgname=python2-tkinter
version=2.7.18.9
revision=2
_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
@@ -88,3 +88,9 @@ idle-python_package() {
vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
}
}
+
+python-tkinter_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
diff --git a/srcpkgs/python2-tkinter/update b/srcpkgs/python2-tkinter/update
new file mode 120000
index 00000000000000..b29540d8f73a12
--- /dev/null
+++ b/srcpkgs/python2-tkinter/update
@@ -0,0 +1 @@
+../python2/update
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python2/files/cross.patch
similarity index 100%
rename from srcpkgs/python/files/cross.patch
rename to srcpkgs/python2/files/cross.patch
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python2/patches/fix-i686-rlock.patch
similarity index 100%
rename from srcpkgs/python/patches/fix-i686-rlock.patch
rename to srcpkgs/python2/patches/fix-i686-rlock.patch
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python2/patches/musl-find_library.patch
similarity index 100%
rename from srcpkgs/python/patches/musl-find_library.patch
rename to srcpkgs/python2/patches/musl-find_library.patch
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python2/patches/sysconfig.patch
similarity index 100%
rename from srcpkgs/python/patches/sysconfig.patch
rename to srcpkgs/python2/patches/sysconfig.patch
diff --git a/srcpkgs/python2/template b/srcpkgs/python2/template
new file mode 100644
index 00000000000000..4d2b2336cdc91d
--- /dev/null
+++ b/srcpkgs/python2/template
@@ -0,0 +1,116 @@
+# Template file for 'python2'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2-tkinter".
+#
+pkgname=python2
+version=2.7.18.9
+revision=2
+_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
+pycompile_dirs="usr/lib/python2.7"
+hostmakedepends="pkg-config"
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
+ sqlite-devel bzip2-devel zlib-devel"
+depends="ca-certificates"
+short_desc="Interpreted, interactive, object-oriented programming language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Python-2.0"
+homepage="https://www.python.org"
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
+
+short_desc+=" (limited install; not for regular use)"
+
+alternatives="
+ python:idle:/usr/bin/idle2.7
+ python:2to3:/usr/bin/2to3-2.7
+ python:pydoc:/usr/bin/pydoc2.7
+ python:python:/usr/bin/python2.7
+ python:python.1:/usr/share/man/man1/python2.7.1"
+
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libxcrypt-devel"
+fi
+
+pre_configure() {
+ # Ensure that internal copies of expat and libffi are not used.
+ rm -r Modules/expat
+ rm -r Modules/_ctypes/libffi*
+ # Enable loading sqlite extensions.
+ vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
+}
+
+do_configure() {
+ local _args
+ unset GCC CC CXX CPP LD AR AS RANLIB
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p host-build
+ cd host-build
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
+ mkdir -p ../hostpython
+ mv python ../hostpython
+ cd ..
+ patch -Np0 -i ${FILESDIR}/cross.patch
+ _args="--build=${XBPS_MACHINE%%-musl}"
+ fi
+ ./configure ${configure_args} ${_args} \
+ --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+ --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
+ --with-system-expat --with-system-ffi --without-ensurepip
+}
+
+do_build() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
+ make ${makejobs}
+}
+
+do_install() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ make DESTDIR=${DESTDIR} altinstall
+ ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
+ ln -sf python2.7 ${DESTDIR}/usr/bin/python2
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
+ ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
+ ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
+}
+
+post_install() {
+ chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
+ vlicense LICENSE
+ rm -f ${DESTDIR}/usr/bin/smtpd.py
+ mv ${DESTDIR}/usr/bin/2to3{,-2.7}
+ mv ${DESTDIR}/usr/bin/pydoc{,2.7}
+ # Remove files that belong to python-tkinter and idle-python
+ rm ${DESTDIR}/usr/bin/idle
+ rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
+ # Remove test module and tests that fail to be byte-compiled.
+ rm -r ${DESTDIR}/usr/lib/python2.7/test
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
+ # Remove references to the install(1) wrapper.
+ vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ if [ "$CROSS_BUILD" ]; then
+ # Remove references to cross toolchain.
+ vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ fi
+}
+
+python2-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/python*-config
+ vmove usr/lib/pkgconfig
+ vmove usr/include
+ vmove usr/lib/python2.7/config/libpython2.7.a
+ mkdir -p ${DESTDIR}/usr/include/python2.7
+ mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
+ ${DESTDIR}/usr/include/python2.7
+ }
+}
diff --git a/srcpkgs/python/update b/srcpkgs/python2/update
similarity index 100%
rename from srcpkgs/python/update
rename to srcpkgs/python2/update
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (28 preceding siblings ...)
2024-09-28 9:01 ` classabbyamp
@ 2024-09-28 9:02 ` classabbyamp
2024-09-28 9:03 ` classabbyamp
` (2 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-28 9:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-2380574190
Comment:
I've moved the following packages:
```
python -> python2
python-devel -> python2-devel
python-tkinter -> python2-tkinter
python-pip -> python2-pip
python-setuptools -> python2-setuptools
```
`python` and `python-devel` became a metapackage; `python-pip`, `python-setuptools`, and `python-tkinter` became transitional packages.
I put your name on `python2-pip` and `python2-
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (29 preceding siblings ...)
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
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-28 9:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38731#issuecomment-2380574190
Comment:
I've moved the following packages:
```
python -> python2
python-devel -> python2-devel
python-tkinter -> python2-tkinter
python-pip -> python2-pip
python-setuptools -> python2-setuptools
```
`python` and `python-devel` became a metapackage with a warning about impending migration to python 3; `python-pip`, `python-setuptools`, and `python-tkinter` became transitional packages.
I put your name on `python2-pip` and `python2-setuptools`.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] buildbot, deps, python 2: remove
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (30 preceding siblings ...)
2024-09-28 9:03 ` classabbyamp
@ 2024-09-28 9:15 ` classabbyamp
2024-09-29 3:21 ` [PR PATCH] [Merged]: buildbot, deps: remove; python -> python2 classabbyamp
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-28 9:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 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, python 2: 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.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
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: 76675 bytes --]
From a9b55b490cd8ae8d5855d18dfc8a45bc7903d2c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/37] buildbot: remove
python 2
---
srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
srcpkgs/buildbot/template | 26 ----------------
srcpkgs/buildbot/update | 1 -
3 files changed, 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 fd6e12edd1a864..00000000000000
--- 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 ae905fc67ab834..00000000000000
--- 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 aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"
From 1774b5da0e4eb367903c2293abdab4ce97b5f8e5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/37] buildbot-slave: remove
python 2
---
srcpkgs/buildbot-slave/template | 13 -------------
srcpkgs/buildbot-slave/update | 1 -
2 files changed, 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 8b6c19bd9e3bd9..00000000000000
--- 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 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file
From d772294150ebbf7bf6a99dc085ceb30af1643ec1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/37] python-Jinja2: remove
python 2
---
srcpkgs/python-Jinja2/template | 21 ---------------------
srcpkgs/python-Jinja2/update | 1 -
2 files changed, 22 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 d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-
-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 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"
From a5a69a290ecb6e1490a750e6a93c742ad157390a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/37] python-MarkupSafe: remove
python 2
---
srcpkgs/python-MarkupSafe/template | 17 -----------------
srcpkgs/python-MarkupSafe/update | 1 -
2 files changed, 18 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 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"
From 57ffbc5dc98f39d38d4378e8f64d220801c69fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/37] python-dateutil: remove
python 2
---
.../patches/setuptools_scm.patch | 28 -------------------
srcpkgs/python-dateutil/template | 21 --------------
2 files changed, 49 deletions(-)
delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
delete mode 100644 srcpkgs/python-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 9e5103ce4d46c7..00000000000000
--- 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 cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
- vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
- vlicense LICENSE
-}
From 6390c9686a55bdcf1916db28302f670b06415e4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/37] python-sqlalchemy-migrate: remove
python 2
---
srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template
diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/migrate-repository{,2}
- mv ${DESTDIR}/usr/bin/migrate{,2}
- vlicense COPYING LICENSE
-}
From c1233165bf03c0e53b8b01b480cc93a0b2de7252 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/37] python-sqlparse: remove
python 2
---
srcpkgs/python-sqlparse/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-sqlparse/template
diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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() {
- mv ${DESTDIR}/usr/bin/sqlformat{,2}
- vlicense LICENSE
-}
From b52cc9f44ff91b8fc6f8b4af81ec393b1ca1c555 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/37] python-tempita: remove
python 2
---
srcpkgs/python-tempita/template | 13 -------------
srcpkgs/python-tempita/update | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 srcpkgs/python-tempita/template
delete mode 100644 srcpkgs/python-tempita/update
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"
From 967f3a826e5e329544aec628e322178fedb25395 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/37] python-SQLAlchemy: remove
python 2
---
srcpkgs/python-SQLAlchemy/template | 19 -------------------
srcpkgs/python-SQLAlchemy/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-SQLAlchemy/template
delete mode 100644 srcpkgs/python-SQLAlchemy/update
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-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
-# no more python2 checks
-make_check=no
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
From 8c6006ac4c3f3a8bd2f9378be1cc5b96f564d21c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/37] python-decorator: remove
python 2
---
srcpkgs/python-decorator/template | 19 -------------------
srcpkgs/python-decorator/update | 2 --
2 files changed, 21 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 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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 8c1b46ba5d3a1f..00000000000000
--- 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)"
From ccfa687aada3c7a09096368bc2af4cce6d71dfe0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/37] python-pbr: remove
python 2
---
srcpkgs/python-pbr/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pbr/template
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pbr{,2}
-}
From e5dc7e2926ac2a7db1ee4082a70828dd755ae7b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/37] python-Twisted: remove
python 2
---
srcpkgs/python-Twisted/INSTALL | 5 -----
srcpkgs/python-Twisted/REMOVE | 5 -----
srcpkgs/python-Twisted/template | 37 ---------------------------------
srcpkgs/python-Twisted/update | 1 -
4 files changed, 48 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 2752e04bc9930e..00000000000000
--- 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 0ffe8186a9433a..00000000000000
--- 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 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-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="Orphaned <orphan@voidlinux.org>"
-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 e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"
From f460523da5706cf1780c63f738237e28004f5430 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/37] python-zope.interface: remove
python 2
---
srcpkgs/python-zope.interface/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-zope.interface/template
diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
- # zope.interface provides the zope namespace
- vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
- vlicense LICENSE.txt LICENSE
-}
From 8974e77d5b00859f68f48490964a26013f1a6efa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/37] python-incremental: remove
python 2
---
srcpkgs/python-incremental/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-incremental/template
diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
- vlicense LICENSE
-}
From 329a2f4d8ecec2cb4ef9e06ad30b418d5785574d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/37] python-hyperlink: remove
python 2
---
srcpkgs/python-hyperlink/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-hyperlink/template
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
- vlicense LICENSE
-}
From c30f92e186d30ff53dbd4f6f4a58a3aad9b02107 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/37] python-constantly: remove
python 2
---
srcpkgs/python-constantly/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-constantly/template
diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
- vlicense LICENSE
-}
From 47c351b646f9a29a60e0634e00d4f7d0cd485c53 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/37] python-service_identity: remove
python 2
---
srcpkgs/python-service_identity/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-service_identity/template
diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
- vlicense LICENSE
-}
From 3266fd232a7c281c62da9348acddc0e6f41396ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/37] python-automat: remove
python 2
---
srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
srcpkgs/python-automat/template | 27 ---------------
2 files changed, 64 deletions(-)
delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
delete mode 100644 srcpkgs/python-automat/template
diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
-
--from inspect import getfullargspec as getArgsSpec
-+try:
-+ # Python 3
-+ from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+ # Python 2
-+ from inspect import getargspec as getArgsSpec
-
- import attr
-+import six
-
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
- return ArgSpec(
- args=tuple(spec.args),
- varargs=spec.varargs,
-- varkw=spec.varkw,
-+ varkw=spec.varkw if six.PY3 else spec.keywords,
- defaults=spec.defaults if spec.defaults else (),
- kwonlyargs=tuple(spec.kwonlyargs),
- kwonlydefaults=(
- tuple(spec.kwonlydefaults.items())
- if spec.kwonlydefaults else ()
-- ),
-+ ) if six.PY3 else (),
- annotations=tuple(spec.annotations.items()),
- )
-
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
- sed -i setup.py \
- -e '/print(/d' \
- -e '/setup_requires=/,+3d' \
- -e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/automat-visualize{,2}
- vlicense LICENSE
-}
From e0540edfc21fa447ffb9d75c605b935046527f38 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/37] python-openssl: remove
python 2
---
srcpkgs/python-openssl/template | 14 --------------
srcpkgs/python-openssl/update | 1 -
2 files changed, 15 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 f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-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 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL
From 96455e8bbb9b6889a11b76e5d7fdb77a0515ff58 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/37] python-PyHamcrest: remove
python 2
---
srcpkgs/python-PyHamcrest/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
- vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 0ca93a6491e30d94eb5c1c82dde92d7116e897d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/37] python-pyasn1-modules: remove
python 2
---
srcpkgs/python-pyasn1-modules/template | 23 -----------------------
1 file changed, 23 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1-modules/template
diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 42bf496be0d8bc7de9894edab13e812ddfc8c5aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/37] python-attrs: remove
python 2
---
srcpkgs/python-attrs/template | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
- vlicense LICENSE
-}
From a44930620fc80c0a30f2d0fb4d209fad6777be34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/37] python-cryptography: remove
python 2
---
srcpkgs/python-cryptography/template | 23 -----------------------
srcpkgs/python-cryptography/update | 2 --
2 files changed, 25 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 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-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="Orphaned <orphan@voidlinux.org>"
-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 b128c2f3bcf83d..00000000000000
--- 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)"
From 2482abf5420422de4b352c4212f48a50d7c42587 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/37] python-six: remove
python 2
---
srcpkgs/python-six/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-six/template
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
- vlicense LICENSE
-}
From 4e8b8891bca37b50dcfb502b23b4b7413be8a626 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/37] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 24 ------------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-cffi/template
delete mode 100644 srcpkgs/python-cffi/update
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 683db6c7b96794..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-reverts="1.16.0_1"
-version=1.15.1
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"
From ca11147ddfe966764bce32c26a45f74f8e410fea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/37] python-pycparser: remove
python 2
---
srcpkgs/python-pycparser/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pycparser/template
diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
- rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
- ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
- vlicense LICENSE
-}
From 8d0ab0d6684712e7ff0fcf238c244800918f093b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/37] python-ply: remove
python 2
---
srcpkgs/python-ply/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-ply/template
diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
- sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
- vlicense LICENSE
-}
From bb291d67c17572118015e4772f996823e3e2e3f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/37] python-enum34: remove
python 2
---
srcpkgs/python-enum34/template | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-enum34/template
diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
- # remove doc
- vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
- vlicense enum/LICENSE
-}
From fcb0c3fe4b51ad0e4783c0e63e737d773096ef06 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/37] python-idna: remove
python 2
---
srcpkgs/python-idna/template | 18 ------------------
1 file changed, 18 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 aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 8096d69e6ebb7c03e7c3ae1a149d00dd5183dfed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/37] python-ipaddress: remove
python 2
---
srcpkgs/python-ipaddress/template | 17 -----------------
1 file changed, 17 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 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-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
-}
From 59b614f873a304dd2aab68c527cb6e05ae95238a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/37] python-pyasn1: remove
python 2
---
srcpkgs/python-pyasn1/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-pyasn1/template
diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
- vlicense LICENSE.rst
-}
From 8ca306d30c0104762e1aa9a5e81bdabcffd6241c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/37] removed-packages: add buildbot and dependency tree
---
srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 51b665f01c180e..d112938291237a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -49,6 +49,8 @@ replaces="
bluez-qt5<=5.115.0_1
bokken<=1.8_3
bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
burp-client<=1.4.40_13
burp-server<=1.4.40_13
bzr<=2.7.0_1
@@ -574,29 +576,42 @@ replaces="
pystopwatch<=2019_2
python-Babel<=2.8.0_4
python-Cython<=0.29.36_1
+ 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-PyHamcrest<=1.9.0_6
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
python-backports.configparser<=3.5.0_2
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
python-cairo-devel<=1.18.2_2
python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
python-contextlib2<=0.6.0.post1_1
python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
python-evdev<=1.2.0_5
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
@@ -604,8 +619,12 @@ replaces="
python-gobject2-devel<=2.28.7_2
python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -620,14 +639,20 @@ replaces="
python-nose<=1.3.7_7
python-notify<=0.1.1_13
python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
python-pretend<=1.0.9_5
python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -644,8 +669,13 @@ replaces="
python-rfc6555<=0.0.0_5
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -654,6 +684,7 @@ replaces="
python-xdg<=0.27_2
python-xlib<=0.29_1
python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
python3-Django<=3.0.7_2
python3-Flask-Assets<=0.12_9
python3-Flask-Mail<=0.9.1_5
From 1431c9026d9f1950a209a1201562dc294975c1bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 33/37] Manual.md: remove unnecessary python 2 documentation
---
Manual.md | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Manual.md b/Manual.md
index a8d19d1439dda1..6d9a0e6289fd71 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
language prefix can be dropped. Short names for languages are no valid substitute
for the language prefix.
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
<a id="language_bindings"></a>
#### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
<name>-<language>
```
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
<a id="programs"></a>
#### Programs
@@ -597,9 +597,9 @@ build methods. By default set to `check`.
- `make_install_target` The installation target. When `${build_style}` is set to `configure`,
`gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
current directory with respect to the install.
- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1047,8 +1047,6 @@ Additional install arguments can be specified via `make_install_args`.
- `waf3` For packages that use the Python3 `waf` build method with python3.
-- `waf` For packages that use the Python `waf` method with python2.
-
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
@@ -1077,8 +1075,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python2-module` to build Python 2.x modules
-
- `python3-module` to build Python 3.x modules
- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1599,7 +1595,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
<a id="pkgs_python"></a>
#### Python packages
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
This sets some environment variables required to allow cross compilation. Support to allow
building a python module for multiple versions from a single template is also possible.
The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1624,7 +1620,7 @@ The following variables may influence how the python packages are built and conf
at post-install time:
- `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
at install time as python modules. This variable expects subset of them that
should be byte-compiled, if default is wrong. Multiple python modules may be specified separated
by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into
From 8eee17448f593c8f2e10c35c1f7f675dab6f3acd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:21:57 -0400
Subject: [PATCH 34/37] common/build-style: remove waf build style
no longer needed by any packages, and should not ever be needed by any
new packages
---
common/build-style/waf.sh | 21 ---------------------
1 file changed, 21 deletions(-)
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
- --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
- : ${configure_script:=waf}
-
- PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}
From 5b1ca818396d602da0981093b0c1a98a0caad832 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:36:54 -0400
Subject: [PATCH 35/37] python-pip: rename to python2-pip
adopted by Leah at her request
---
srcpkgs/python-pip | 1 +
.../patches/no-versioned-pip.patch | 0
srcpkgs/{python-pip => python2-pip}/template | 18 ++++++++++++------
srcpkgs/{python-pip => python2-pip}/update | 0
4 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-pip
rename srcpkgs/{python-pip => python2-pip}/patches/no-versioned-pip.patch (100%)
rename srcpkgs/{python-pip => python2-pip}/template (58%)
rename srcpkgs/{python-pip => python2-pip}/update (100%)
diff --git a/srcpkgs/python-pip b/srcpkgs/python-pip
new file mode 120000
index 00000000000000..c63a33926675c8
--- /dev/null
+++ b/srcpkgs/python-pip
@@ -0,0 +1 @@
+python2-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python2-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python2-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python2-pip/template
similarity index 58%
rename from srcpkgs/python-pip/template
rename to srcpkgs/python2-pip/template
index 00d8875f2f9e2a..c3955779cd7c31 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python2-pip/template
@@ -1,12 +1,12 @@
-# Template file for 'python-pip'
-pkgname=python-pip
+# Template file for 'python2-pip'
+pkgname=python2-pip
version=20.3.4
-revision=1
+revision=2
build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
+hostmakedepends="python2-setuptools"
+depends="python2-setuptools"
short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
@@ -17,3 +17,9 @@ post_install() {
vlicense LICENSE.txt
mv ${DESTDIR}/usr/bin/pip{,2}
}
+
+python-pip_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python2-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python2-pip/update
From 2497ab964d9db2bd1e156597bf0fa8dde0650d6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:38:37 -0400
Subject: [PATCH 36/37] python-setuptools: rename to python2-setuptools
adopted by Leah at her request
---
srcpkgs/python-setuptools | 1 +
.../template | 18 ++++++++++++------
.../update | 0
3 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/python-setuptools
rename srcpkgs/{python-setuptools => python2-setuptools}/template (70%)
rename srcpkgs/{python-setuptools => python2-setuptools}/update (100%)
diff --git a/srcpkgs/python-setuptools b/srcpkgs/python-setuptools
new file mode 120000
index 00000000000000..05923bd3cc80b0
--- /dev/null
+++ b/srcpkgs/python-setuptools
@@ -0,0 +1 @@
+python2-setuptools
\ No newline at end of file
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python2-setuptools/template
similarity index 70%
rename from srcpkgs/python-setuptools/template
rename to srcpkgs/python2-setuptools/template
index 5c5faa52fec451..a3c18827a7ecd0 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python2-setuptools/template
@@ -1,14 +1,14 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
+# Template file for 'python2-setuptools'
+pkgname=python2-setuptools
# https://github.com/pypa/setuptools/issues/1458
# python2 support for setuptools ended at 44.0.0
version=44.0.0
-revision=2
+revision=3
build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
+hostmakedepends="python2-devel"
+depends="python2"
short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/pypa/setuptools"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
@@ -24,3 +24,9 @@ post_install() {
vlicense LICENSE
mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
}
+
+python-setuptools_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python2-setuptools/update
similarity index 100%
rename from srcpkgs/python-setuptools/update
rename to srcpkgs/python2-setuptools/update
From 7aa01bc6105db09cf3d1985533bace80f57193e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:39:10 -0400
Subject: [PATCH 37/37] python: rename to python2, convert to metapackage
metapackage points at 2.7 for now, but will change at a later date
closes #38229
---
srcpkgs/python-tkinter | 1 +
srcpkgs/python-tkinter/files/cross.patch | 1 -
srcpkgs/python-tkinter/update | 1 -
srcpkgs/python/INSTALL.msg | 2 +
srcpkgs/python/template | 116 ++----------------
srcpkgs/python2-devel | 1 +
srcpkgs/python2-tkinter/files/cross.patch | 1 +
.../files/idle2.desktop | 0
.../files/idle2.xpm | 0
.../template | 14 ++-
srcpkgs/python2-tkinter/update | 1 +
srcpkgs/{python => python2}/files/cross.patch | 0
.../patches/fix-i686-rlock.patch | 0
.../patches/musl-find_library.patch | 0
.../patches/sysconfig.patch | 0
srcpkgs/python2/template | 116 ++++++++++++++++++
srcpkgs/{python => python2}/update | 0
17 files changed, 141 insertions(+), 113 deletions(-)
create mode 120000 srcpkgs/python-tkinter
delete mode 120000 srcpkgs/python-tkinter/files/cross.patch
delete mode 120000 srcpkgs/python-tkinter/update
create mode 100644 srcpkgs/python/INSTALL.msg
create mode 120000 srcpkgs/python2-devel
create mode 120000 srcpkgs/python2-tkinter/files/cross.patch
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.desktop (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.xpm (100%)
rename srcpkgs/{python-tkinter => python2-tkinter}/template (88%)
create mode 120000 srcpkgs/python2-tkinter/update
rename srcpkgs/{python => python2}/files/cross.patch (100%)
rename srcpkgs/{python => python2}/patches/fix-i686-rlock.patch (100%)
rename srcpkgs/{python => python2}/patches/musl-find_library.patch (100%)
rename srcpkgs/{python => python2}/patches/sysconfig.patch (100%)
create mode 100644 srcpkgs/python2/template
rename srcpkgs/{python => python2}/update (100%)
diff --git a/srcpkgs/python-tkinter b/srcpkgs/python-tkinter
new file mode 120000
index 00000000000000..5e2384079e0e4d
--- /dev/null
+++ b/srcpkgs/python-tkinter
@@ -0,0 +1 @@
+python2-tkinter
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
deleted file mode 120000
index c27b8a16c11313..00000000000000
--- a/srcpkgs/python-tkinter/files/cross.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
diff --git a/srcpkgs/python/INSTALL.msg b/srcpkgs/python/INSTALL.msg
new file mode 100644
index 00000000000000..c601330e59e94d
--- /dev/null
+++ b/srcpkgs/python/INSTALL.msg
@@ -0,0 +1,2 @@
+This package will install python3 soon. If you wish to keep Python 2,
+mark python2 as manually installed with xbps-pkgdb(1).
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 57e2d76db0a905..c7d9066c75813b 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,114 +1,16 @@
# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
pkgname=python
-version=2.7.18.9
-revision=2
-_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
+version=2.7.9999
+revision=1
+build_style=meta
+depends="python${version%%.*}"
+short_desc="Python programming language (metapackage)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat and libffi are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
- if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
- patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
- fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
- --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
- make DESTDIR=${DESTDIR} altinstall
- ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
- ln -sf python2.7 ${DESTDIR}/usr/bin/python2
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
- ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
- ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
- ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
- chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/smtpd.py
- mv ${DESTDIR}/usr/bin/2to3{,-2.7}
- mv ${DESTDIR}/usr/bin/pydoc{,2.7}
- # Remove files that belong to python-tkinter and idle-python
- rm ${DESTDIR}/usr/bin/idle
- rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
- rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
- # Remove test module and tests that fail to be byte-compiled.
- rm -r ${DESTDIR}/usr/lib/python2.7/test
- rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
- # Remove references to the install(1) wrapper.
- vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- if [ "$CROSS_BUILD" ]; then
- # Remove references to cross toolchain.
- vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
- ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
- ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
- fi
-}
python-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="python${version%%.*}-devel"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/python*-config
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove usr/lib/python2.7/config/libpython2.7.a
- mkdir -p ${DESTDIR}/usr/include/python2.7
- mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
- ${DESTDIR}/usr/include/python2.7
- }
+ build_style=meta
}
diff --git a/srcpkgs/python2-devel b/srcpkgs/python2-devel
new file mode 120000
index 00000000000000..551ab268585033
--- /dev/null
+++ b/srcpkgs/python2-devel
@@ -0,0 +1 @@
+python2
\ No newline at end of file
diff --git a/srcpkgs/python2-tkinter/files/cross.patch b/srcpkgs/python2-tkinter/files/cross.patch
new file mode 120000
index 00000000000000..352ebe295b5b38
--- /dev/null
+++ b/srcpkgs/python2-tkinter/files/cross.patch
@@ -0,0 +1 @@
+../../python2/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python2-tkinter/files/idle2.desktop
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.desktop
rename to srcpkgs/python2-tkinter/files/idle2.desktop
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python2-tkinter/files/idle2.xpm
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.xpm
rename to srcpkgs/python2-tkinter/files/idle2.xpm
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python2-tkinter/template
similarity index 88%
rename from srcpkgs/python-tkinter/template
rename to srcpkgs/python2-tkinter/template
index 37f263262aa4e0..f527446cf655d5 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python2-tkinter/template
@@ -1,12 +1,12 @@
-# Template file for 'python-tkinter'
+# Template file for 'python2-tkinter'
#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: python2 -> tk -> libX11 -> libxcb -> xcb-proto -> python2
#
_desc="Interpreted, interactive, object-oriented programming language"
-pkgname=python-tkinter
+pkgname=python2-tkinter
version=2.7.18.9
revision=2
_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
@@ -88,3 +88,9 @@ idle-python_package() {
vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
}
}
+
+python-tkinter_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
diff --git a/srcpkgs/python2-tkinter/update b/srcpkgs/python2-tkinter/update
new file mode 120000
index 00000000000000..b29540d8f73a12
--- /dev/null
+++ b/srcpkgs/python2-tkinter/update
@@ -0,0 +1 @@
+../python2/update
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python2/files/cross.patch
similarity index 100%
rename from srcpkgs/python/files/cross.patch
rename to srcpkgs/python2/files/cross.patch
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python2/patches/fix-i686-rlock.patch
similarity index 100%
rename from srcpkgs/python/patches/fix-i686-rlock.patch
rename to srcpkgs/python2/patches/fix-i686-rlock.patch
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python2/patches/musl-find_library.patch
similarity index 100%
rename from srcpkgs/python/patches/musl-find_library.patch
rename to srcpkgs/python2/patches/musl-find_library.patch
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python2/patches/sysconfig.patch
similarity index 100%
rename from srcpkgs/python/patches/sysconfig.patch
rename to srcpkgs/python2/patches/sysconfig.patch
diff --git a/srcpkgs/python2/template b/srcpkgs/python2/template
new file mode 100644
index 00000000000000..4d2b2336cdc91d
--- /dev/null
+++ b/srcpkgs/python2/template
@@ -0,0 +1,116 @@
+# Template file for 'python2'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2-tkinter".
+#
+pkgname=python2
+version=2.7.18.9
+revision=2
+_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
+pycompile_dirs="usr/lib/python2.7"
+hostmakedepends="pkg-config"
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
+ sqlite-devel bzip2-devel zlib-devel"
+depends="ca-certificates"
+short_desc="Interpreted, interactive, object-oriented programming language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Python-2.0"
+homepage="https://www.python.org"
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
+
+short_desc+=" (limited install; not for regular use)"
+
+alternatives="
+ python:idle:/usr/bin/idle2.7
+ python:2to3:/usr/bin/2to3-2.7
+ python:pydoc:/usr/bin/pydoc2.7
+ python:python:/usr/bin/python2.7
+ python:python.1:/usr/share/man/man1/python2.7.1"
+
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libxcrypt-devel"
+fi
+
+pre_configure() {
+ # Ensure that internal copies of expat and libffi are not used.
+ rm -r Modules/expat
+ rm -r Modules/_ctypes/libffi*
+ # Enable loading sqlite extensions.
+ vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
+}
+
+do_configure() {
+ local _args
+ unset GCC CC CXX CPP LD AR AS RANLIB
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p host-build
+ cd host-build
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+ env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
+ mkdir -p ../hostpython
+ mv python ../hostpython
+ cd ..
+ patch -Np0 -i ${FILESDIR}/cross.patch
+ _args="--build=${XBPS_MACHINE%%-musl}"
+ fi
+ ./configure ${configure_args} ${_args} \
+ --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+ --with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
+ --with-system-expat --with-system-ffi --without-ensurepip
+}
+
+do_build() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
+ make ${makejobs}
+}
+
+do_install() {
+ export PATH="$PATH:$wrksrc/hostpython"
+ make DESTDIR=${DESTDIR} altinstall
+ ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
+ ln -sf python2.7 ${DESTDIR}/usr/bin/python2
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
+ ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
+ ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
+ ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
+}
+
+post_install() {
+ chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
+ vlicense LICENSE
+ rm -f ${DESTDIR}/usr/bin/smtpd.py
+ mv ${DESTDIR}/usr/bin/2to3{,-2.7}
+ mv ${DESTDIR}/usr/bin/pydoc{,2.7}
+ # Remove files that belong to python-tkinter and idle-python
+ rm ${DESTDIR}/usr/bin/idle
+ rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
+ # Remove test module and tests that fail to be byte-compiled.
+ rm -r ${DESTDIR}/usr/lib/python2.7/test
+ rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
+ # Remove references to the install(1) wrapper.
+ vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ if [ "$CROSS_BUILD" ]; then
+ # Remove references to cross toolchain.
+ vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+ ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+ fi
+}
+
+python2-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/python*-config
+ vmove usr/lib/pkgconfig
+ vmove usr/include
+ vmove usr/lib/python2.7/config/libpython2.7.a
+ mkdir -p ${DESTDIR}/usr/include/python2.7
+ mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
+ ${DESTDIR}/usr/include/python2.7
+ }
+}
diff --git a/srcpkgs/python/update b/srcpkgs/python2/update
similarity index 100%
rename from srcpkgs/python/update
rename to srcpkgs/python2/update
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PR PATCH] [Merged]: buildbot, deps: remove; python -> python2
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
` (31 preceding siblings ...)
2024-09-28 9:15 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-29 3:21 ` classabbyamp
32 siblings, 0 replies; 34+ messages in thread
From: classabbyamp @ 2024-09-29 3:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
There's a merged pull request on the void-packages repository
buildbot, deps: remove; python -> python2
https://github.com/void-linux/void-packages/pull/38731
Description:
## ! 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.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2024-09-29 3:21 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
2022-08-17 5:37 ` classabbyamp
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
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).