From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [NOMERGE] buildbot & deps: remove
Date: Thu, 06 Oct 2022 13:52:16 +0200 [thread overview]
Message-ID: <20221006115216.RNH15BiuQ43iEKX5lqyc9G5Huk-ERhGztVrOlm_SkjU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38731@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 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
next prev parent reply other threads:[~2022-10-06 11:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:06 [PR PATCH] " classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
2022-08-17 5:37 ` classabbyamp
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221006115216.RNH15BiuQ43iEKX5lqyc9G5Huk-ERhGztVrOlm_SkjU@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).