* [PR PATCH] remove python2 checkdepends
@ 2022-09-25 13:26 paper42
2022-09-26 23:22 ` paper42
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: paper42 @ 2022-09-25 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
TODO: add each removed package to removed-packages
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 45868 bytes --]
From b04c978a3121840610d596ec86329d9558c735e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/27] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From c1cfe305f8b85c2717980c2cccd77ffd8c3dfe04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/27] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 3 +--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..9f047382fdc1 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,13 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 1a3f6e233bd1d59865eb5cfea50dd15c86390441 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/27] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From f944435a38f545a1244339a02de471dfc0a8bc79 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/27] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 7c0305aaa8a4cd0387a53b2c59e7e45b525771ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/27] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 90948508ee3b2083f77a6a6d324a6ef03e92c2ed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/27] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From 1210c5ce7e7239a0b678df784474c41c279f2e2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/27] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From ffa9e63005380b0dd02b94e0c6cd9758d233e431 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/27] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From a3b58436083d3e65a4dde392890048b35ebb142c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/27] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From 5663e7671aa2c052ba4584343a5ba22c1a5ff139 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/27] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..995dc22d1cae
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-scandir"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From a6eb86aa3943f061f090944f4ffc2180d3084ba6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/27] python-scandir: remove package
---
srcpkgs/python-scandir/template | 30 ------------------------------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..0950352b0c7d
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=7
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 63496aeaecaff11a697e1bc7114e5c736e34db06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/27] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 21 ++++++-------------
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..49ed39a1fd8a 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,12 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +16,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 657da0aa15d38f85a9752a50d78104c5f2c6cc6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/27] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From 46f91830aee94d0654d4591f73fbe838be9783bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/27] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From f5deb2a8af4e445f61e010b74bd04003a25763c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/27] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From bc2de6351466d008e5fc76d446014a75fa8b07b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/27] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From c544185143e14499924c1fcab59c7804b864f912 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/27] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From f3186afd278a78ebba8ce0f93e3e271312c633b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/27] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 55b8d4669ee340fd397dc132f7dd1bb001018e3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/27] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 49d4aafb892911aa14f2256fb0fa9c0e6f78690e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/27] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 42ba8eddc728d532ac5fd0a8d08c464bd47d0a5b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/27] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From fc7b799422960500a7ae2b35c3730a24fbbd2c96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/27] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From 7b00b208bcda608e316c178a2a6df9d7b02a87cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/27] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From f1e4457599b4ce6899877c620232870b3dd646a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/27] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From 11be60f8aa5025bb078927a80413bed5be793f2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/27] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From 8824efb4001d93bed40c5b016c61648e28b95395 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/27] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From f7f4802bb3a1a491253e407587a18c2b964bfb01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/27] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 15 +++++++++++
.../update | 0
5 files changed, 15 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..c9df64c156eb
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
@ 2022-09-26 23:22 ` paper42
2022-10-06 9:10 ` [PR PATCH] [Updated] " classabbyamp
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-09-26 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39457#issuecomment-1258758279
Comment:
> Should the removals be added to `removed-packages`?
Yes, that's why this is a draft right now.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
2022-09-26 23:22 ` paper42
@ 2022-10-06 9:10 ` classabbyamp
2022-10-06 9:11 ` [PR REVIEW] " classabbyamp
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
TODO: add each removed package to removed-packages
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 48803 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 0ae46165c88dd62f3b6c5204e4987dd55cabb4e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 3 +--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..9f047382fdc1 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,13 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 3e968076d6c15571856324266083bec907c42cd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From c415fb70fca90d1d4ac1828585b2502b2681f265 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 63d2191a65c94747cbe7b6b11a76a187ea9827cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 81c7728f9c76eb0a98e34698562f912500d8d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From 1f0f0b2b210689a7bba755969e38b57bd2b667c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 4328250d3847d456de9f63394d13338b238359d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 0c7c98ef27e10f63f0645127ce7088d12d28cd16 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From f08d20933d6b3640ac163892888510350633a38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..995dc22d1cae
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-scandir"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 642f13916c0dc4320709723f0b212807108615fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package
---
srcpkgs/python-scandir/template | 30 ------------------------------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..0950352b0c7d
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=7
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 27e4125949bc6f5ccac19afe2dc830f61ae93af6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 21 ++++++-------------
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..49ed39a1fd8a 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,12 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +16,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From fe3d8a5fd55e5a6baa2e1b9864bc55675a2b28fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From 3046bf85004eb27b7b3b4885a052b458d432530b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From a8cc74212e2d306da404a2b95fdcd44863fc4f30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From eff2d27310219530c202a5296cfa4cf062fcbcfa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From ac6a8b11823cca67423e06ceb8426075cb44759d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From 2c6ecf16733fb38bb074b956a2d1532ae1d08533 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 19ba53b6aefd0d99fcfd79b8ae7dc39cfb690fcb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From afc05feefffe5da87311b65067e45639d2fe305e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 196d0025171f550a46b1718388c42f7c4759d0f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From 3c5b753a501b2aff89462381113becea65667d0f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From c5d3af5e1a2f19c5c898beb3900f82f55c305fca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From e04bf0f441351432750a0986f9b7fd4373edc9d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From aa3e1976c7dfdde02d243b79660b37e349ffb5a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From 9837c16223d716e83188b6627b2f44a9d90030f7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From 090efb039e5813165bbf06531998335fa02538f7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 15 +++++++++++
.../update | 0
5 files changed, 15 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..c9df64c156eb
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From 06d5ea4daf31dc8e6c4d277e301bf04e9acdbd37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
2022-09-26 23:22 ` paper42
2022-10-06 9:10 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-10-06 9:11 ` classabbyamp
2022-10-06 9:23 ` [PR PATCH] [Updated] " classabbyamp
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/39457#discussion_r988767469
Comment:
this was out of sort order 🤷♀️
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (2 preceding siblings ...)
2022-10-06 9:11 ` [PR REVIEW] " classabbyamp
@ 2022-10-06 9:23 ` classabbyamp
2022-10-06 9:34 ` classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 51984 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 0ae46165c88dd62f3b6c5204e4987dd55cabb4e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 3 +--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..9f047382fdc1 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,13 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 3e968076d6c15571856324266083bec907c42cd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From c415fb70fca90d1d4ac1828585b2502b2681f265 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 63d2191a65c94747cbe7b6b11a76a187ea9827cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 81c7728f9c76eb0a98e34698562f912500d8d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From 1f0f0b2b210689a7bba755969e38b57bd2b667c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 4328250d3847d456de9f63394d13338b238359d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 0c7c98ef27e10f63f0645127ce7088d12d28cd16 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From f08d20933d6b3640ac163892888510350633a38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..995dc22d1cae
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-scandir"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 7685fba2e488ac73453651c09b706480445d4e80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package, fix python3 build
---
srcpkgs/python-scandir/template | 30 ----------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/patches/py3.10.patch | 63 ++++++++++++++++++++
srcpkgs/python3-scandir/template | 19 ++++++
4 files changed, 82 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/patches/py3.10.patch
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/patches/py3.10.patch b/srcpkgs/python3-scandir/patches/py3.10.patch
new file mode 100644
index 000000000000..13f221a6e945
--- /dev/null
+++ b/srcpkgs/python3-scandir/patches/py3.10.patch
@@ -0,0 +1,63 @@
+(only includes changes to _scandir.c, others are irrelevant)
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+ 663 | char *PyStructSequence_UnnamedField = "unnamed field";
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+ from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+ 22 | extern const char * const PyStructSequence_UnnamedField;
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ .github/workflows/tests.yml | 2 +-
+ _scandir.c | 10 +++++-----
+ scandir.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+ return v;
+ }
+
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+ {"st_uid", "user ID of owner"},
+ {"st_gid", "group ID of owner"},
+ {"st_size", "total size, in bytes"},
+- /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++ /* The NULL is replaced with scandir_unnamed_field later. */
+ {NULL, "integer time of last access"},
+ {NULL, "integer time of last modification"},
+ {NULL, "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+ if (!billion)
+ INIT_ERROR;
+
+- stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++ stat_result_desc.fields[7].name = scandir_unnamed_field;
++ stat_result_desc.fields[8].name = scandir_unnamed_field;
++ stat_result_desc.fields[9].name = scandir_unnamed_field;
+ PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+ structseq_new = StatResultType.tp_new;
+ StatResultType.tp_new = statresult_new;
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..8525e36bf56f
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=8
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 6af02d11453ecc5719c8a1bd9af3709548c33694 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 21 ++++++-------------
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..49ed39a1fd8a 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,12 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +16,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From b2f06451bd7933db81ea3a880e51578af8201731 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From 8f3a4b2ed90064a53cbb9ed03a095aee23fc2b2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From fc234a3ab7de964d7907f1df1f134e6c3efb0ac6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From c74aa045b425c5ec12677c805b9ce25dbf409eef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From a87ef511825dc25452981c56e84c71076f3d8391 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From 50bf2b09e595f862e884a3f25875c99c46d94e91 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 8c785f32140f94895e2c522c56ef9891772c915a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 9777bd36ba1f1a8c86c63b0163f03cc73c63ac9a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 3e86ac84165b3a0eda511752db5c2281df3ecf72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From 0ffe6f5780cf8cef97b77e35298eee6728edf516 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From 66bc3da42f913cea06fd14b1ecb7437c18f3f058 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From 3202b8b5a55637b4bf0245adfb5a18ea7d6c52e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From c6d953ad0b8f6d86208e846890baceb6a0d6e0c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From 444b97732341391fa36f0ae0e38e35d16fa41da7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From 8ca972db9b8abc524a79b751536dada0b0a8fc07 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 15 +++++++++++
.../update | 0
5 files changed, 15 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..c9df64c156eb
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From 5dca0eeb5c24495d956307be1faf3e960dfb5f72 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (3 preceding siblings ...)
2022-10-06 9:23 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-10-06 9:34 ` classabbyamp
2022-10-06 9:44 ` classabbyamp
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 52015 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 0ae46165c88dd62f3b6c5204e4987dd55cabb4e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 3 +--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..9f047382fdc1 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,13 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 3e968076d6c15571856324266083bec907c42cd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From c415fb70fca90d1d4ac1828585b2502b2681f265 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 63d2191a65c94747cbe7b6b11a76a187ea9827cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 81c7728f9c76eb0a98e34698562f912500d8d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From 1f0f0b2b210689a7bba755969e38b57bd2b667c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 4328250d3847d456de9f63394d13338b238359d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 0c7c98ef27e10f63f0645127ce7088d12d28cd16 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From f08d20933d6b3640ac163892888510350633a38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..995dc22d1cae
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-scandir"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 7685fba2e488ac73453651c09b706480445d4e80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package, fix python3 build
---
srcpkgs/python-scandir/template | 30 ----------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/patches/py3.10.patch | 63 ++++++++++++++++++++
srcpkgs/python3-scandir/template | 19 ++++++
4 files changed, 82 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/patches/py3.10.patch
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/patches/py3.10.patch b/srcpkgs/python3-scandir/patches/py3.10.patch
new file mode 100644
index 000000000000..13f221a6e945
--- /dev/null
+++ b/srcpkgs/python3-scandir/patches/py3.10.patch
@@ -0,0 +1,63 @@
+(only includes changes to _scandir.c, others are irrelevant)
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+ 663 | char *PyStructSequence_UnnamedField = "unnamed field";
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+ from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+ 22 | extern const char * const PyStructSequence_UnnamedField;
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ .github/workflows/tests.yml | 2 +-
+ _scandir.c | 10 +++++-----
+ scandir.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+ return v;
+ }
+
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+ {"st_uid", "user ID of owner"},
+ {"st_gid", "group ID of owner"},
+ {"st_size", "total size, in bytes"},
+- /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++ /* The NULL is replaced with scandir_unnamed_field later. */
+ {NULL, "integer time of last access"},
+ {NULL, "integer time of last modification"},
+ {NULL, "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+ if (!billion)
+ INIT_ERROR;
+
+- stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++ stat_result_desc.fields[7].name = scandir_unnamed_field;
++ stat_result_desc.fields[8].name = scandir_unnamed_field;
++ stat_result_desc.fields[9].name = scandir_unnamed_field;
+ PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+ structseq_new = StatResultType.tp_new;
+ StatResultType.tp_new = statresult_new;
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..8525e36bf56f
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=8
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 25daf2e004756b42a059c9ed0b5bc61a04ef4818 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..6544018ac6f6 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,13 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +17,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From e4dc28f074bd67555710aa8ab7b0d5be4ddbdf29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From a9e2857d8d5629ad305f69115d24bfc22b94891d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From d4155c904ec687127b9492dd64cc626a88bbea20 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From 81c749324a8bce6f873e3af25f54a640efb9a29b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From 5edd224d625cd0c4f41784ed8e62fc534c041dee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From 755fd8d440a751312fb5ac89c9443d38fdde4c12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 9c810b18a8d11f9e662cc15c78d65754e543f33e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 9188fa728da17e8c78a66c41f21b6209fbe5722c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 61e06179a9778863483e593444c1a9950f62b871 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From f4e653820f2a2b3907c8cb1ec200e12a6962670a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From a6f58be9b646078e412cd4397d1f29534955fa26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From bca1c01031d84befce750142027ef075276f5163 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From 1a5862e023bb61aaea2eeebca6f87087d0c5c55f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From 6ffd608ae0cf968ca011d8fa48c369dda21af6e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From cf853e59c108681e06c56462630b0dfbd2243147 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 15 +++++++++++
.../update | 0
5 files changed, 15 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..c9df64c156eb
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From 1d0595ec634dd270233fc1e47086a642cc76d499 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (4 preceding siblings ...)
2022-10-06 9:34 ` classabbyamp
@ 2022-10-06 9:44 ` classabbyamp
2022-10-06 9:54 ` classabbyamp
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 52027 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 0ae46165c88dd62f3b6c5204e4987dd55cabb4e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 3 +--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..9f047382fdc1 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,13 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 3e968076d6c15571856324266083bec907c42cd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From c415fb70fca90d1d4ac1828585b2502b2681f265 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 63d2191a65c94747cbe7b6b11a76a187ea9827cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 81c7728f9c76eb0a98e34698562f912500d8d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From 1f0f0b2b210689a7bba755969e38b57bd2b667c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 4328250d3847d456de9f63394d13338b238359d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 0c7c98ef27e10f63f0645127ce7088d12d28cd16 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From cdad78733b553dccc5122577ee4fadb71207218a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..9f284c9cd9b5
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="${depends}"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 9a54a18b64f41ab7f97b78d6b97b15dd07d394e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package, fix python3 build
---
srcpkgs/python-scandir/template | 30 ----------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/patches/py3.10.patch | 63 ++++++++++++++++++++
srcpkgs/python3-scandir/template | 19 ++++++
4 files changed, 82 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/patches/py3.10.patch
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/patches/py3.10.patch b/srcpkgs/python3-scandir/patches/py3.10.patch
new file mode 100644
index 000000000000..13f221a6e945
--- /dev/null
+++ b/srcpkgs/python3-scandir/patches/py3.10.patch
@@ -0,0 +1,63 @@
+(only includes changes to _scandir.c, others are irrelevant)
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+ 663 | char *PyStructSequence_UnnamedField = "unnamed field";
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+ from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+ 22 | extern const char * const PyStructSequence_UnnamedField;
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ .github/workflows/tests.yml | 2 +-
+ _scandir.c | 10 +++++-----
+ scandir.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+ return v;
+ }
+
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+ {"st_uid", "user ID of owner"},
+ {"st_gid", "group ID of owner"},
+ {"st_size", "total size, in bytes"},
+- /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++ /* The NULL is replaced with scandir_unnamed_field later. */
+ {NULL, "integer time of last access"},
+ {NULL, "integer time of last modification"},
+ {NULL, "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+ if (!billion)
+ INIT_ERROR;
+
+- stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++ stat_result_desc.fields[7].name = scandir_unnamed_field;
++ stat_result_desc.fields[8].name = scandir_unnamed_field;
++ stat_result_desc.fields[9].name = scandir_unnamed_field;
+ PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+ structseq_new = StatResultType.tp_new;
+ StatResultType.tp_new = statresult_new;
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..8525e36bf56f
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=8
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 209557a9b441157a4d8197ee24d878e8d034bc0a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..6544018ac6f6 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,13 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +17,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From aacd0a58a537c7b39a5a6679037a27772e4e4b9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From 4340bb0c77a57e033b5a64383f639bc1c2e92626 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From 257777c910d854128c8e84e8fef3d48744680980 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From 22a97d72aac1139772f5f91747e2e923e2ad68af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From 51b0fbf15220c6327fca6226083a333ac5cdc297 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From daecfba79045c0f32ed3b0315e7226c6c0b4aa3b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 2da71a16588fd4645e3c61729a5b4039fb6872d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 77c76372d93becde930a0e014459cd3970c82616 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 1ea31d629fdb0318e48e47d4690bddc1dde4acd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From 4f99d7f3fb675c09624b6d5a01c0e6b85cecfd40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From f9a54a5f9b7ba98f6ffd30c31bc678c7b83a4faa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From b187e598fbb481b67da8d454768cf914ec917eea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From ec8ee486d90c46a923dad661dd57ebc284327e44 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From cb779c978ea38a1cd6d1c149d64347cd617b092e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From f76ee926969807567f5d40c2135c336ef1ad1f27 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 15 +++++++++++
.../update | 0
5 files changed, 15 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..c9df64c156eb
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From 16df7e4615c5ad23f48c218742f02b8023bd0b47 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (5 preceding siblings ...)
2022-10-06 9:44 ` classabbyamp
@ 2022-10-06 9:54 ` classabbyamp
2022-10-06 10:09 ` classabbyamp
2022-10-06 10:29 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 52198 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 570f7cf82e27967c304e982f7c1891fe25077c48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 4 ++--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..e037cc375ba5 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,14 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+# no more python2 checks
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 1556da0963dd30574ef447f649208963f4560b13 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From b8c9f2b85d7ff7831740c42769edbeabdd6a8999 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..3e572c67ec8a 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,8 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python-zope.interface python3-zope.interface
+ python3-six"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +16,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From b0592795a536f0580499efe54bf3bd140ec780fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 19f33abc2f845319e1388b849e32ec42258571b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From d022322dc30d7ec93f4ad531f7617abc9cf1d596 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 569b3d0e6af90bee41f22f6fd4b1537b24f24028 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 7512fb7a9780e77aeb37411e6503d4954fad654d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From 4d95582df600acc4f1b67a30101d9ff447e00da3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..9f284c9cd9b5
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="${depends}"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From e857895c4cb4c1f70063d079cf765df7ee637842 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package, fix python3 build
---
srcpkgs/python-scandir/template | 30 ----------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/patches/py3.10.patch | 63 ++++++++++++++++++++
srcpkgs/python3-scandir/template | 19 ++++++
4 files changed, 82 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/patches/py3.10.patch
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/patches/py3.10.patch b/srcpkgs/python3-scandir/patches/py3.10.patch
new file mode 100644
index 000000000000..13f221a6e945
--- /dev/null
+++ b/srcpkgs/python3-scandir/patches/py3.10.patch
@@ -0,0 +1,63 @@
+(only includes changes to _scandir.c, others are irrelevant)
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+ 663 | char *PyStructSequence_UnnamedField = "unnamed field";
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+ from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+ 22 | extern const char * const PyStructSequence_UnnamedField;
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ .github/workflows/tests.yml | 2 +-
+ _scandir.c | 10 +++++-----
+ scandir.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+ return v;
+ }
+
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+ {"st_uid", "user ID of owner"},
+ {"st_gid", "group ID of owner"},
+ {"st_size", "total size, in bytes"},
+- /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++ /* The NULL is replaced with scandir_unnamed_field later. */
+ {NULL, "integer time of last access"},
+ {NULL, "integer time of last modification"},
+ {NULL, "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+ if (!billion)
+ INIT_ERROR;
+
+- stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++ stat_result_desc.fields[7].name = scandir_unnamed_field;
++ stat_result_desc.fields[8].name = scandir_unnamed_field;
++ stat_result_desc.fields[9].name = scandir_unnamed_field;
+ PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+ structseq_new = StatResultType.tp_new;
+ StatResultType.tp_new = statresult_new;
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..8525e36bf56f
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=8
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From d9e2526f144d0a96c68fd601d16123ce216559d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..6544018ac6f6 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,13 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +17,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 17c1bc0880576b9b9b3dc20a06fc987efcd315b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From a33afce1eacce6eea83f6410103d9d09303cf616 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From 173ea27a803ce6d947d2fb0259bb909ab8a309f8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From be404d97c6fa9ef1148d46d3caf999ae4be6037d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From 2aa209e48c2ff2328742bb08520ad34b85d9c4e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From 406d18d330614740a222fc9e1041f4882fc52f6b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 248be8e143503631fefba3d74d4c8e7449601fb9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 47dc99556557051e709249e663ecc53777753a74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 1f8ba17e279cc3c5a910b737f6b99118a884dd1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From 6200df96c0359221257bcdbeb46f28e4e57c342d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From 8ced07388980cf294e7887384ab026367d7a7c73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From b188ab88c85d9efe812b809d4f715e32bccc6b0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From 45460876dcaddaa6afb588f6a6d81f4b28432923 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From 4122890ba3de5be0cd30d60f306c82b6537cce19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From 14f856c86aacaf5a453a01731508fb1a3422f625 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 18 +++++++++++++
.../update | 0
5 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..651971884fe6
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+checkdepends="python3-pytest-xdist python3-flaky python3-unittest-mixins"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
+# coverage executable needs to run for many tests
+make_check=no
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From d25d6243d79fad3c9e8cdc8db5f39cfdd3f0671b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (6 preceding siblings ...)
2022-10-06 9:54 ` classabbyamp
@ 2022-10-06 10:09 ` classabbyamp
2022-10-06 10:29 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 10:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages remove-python2-checkdeps
https://github.com/void-linux/void-packages/pull/39457
remove python2 checkdepends
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python2-checkdeps-39457.patch --]
[-- Type: text/x-diff, Size: 52191 bytes --]
From a3941d2d44ef8b144c1314b6fe3561e345218707 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:38:10 +0200
Subject: [PATCH 01/28] python-Jinja2: disable tests
---
srcpkgs/python-Jinja2/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 3e8ab4268b5d..fb7976d05949 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -6,7 +6,6 @@ wrksrc="Jinja2-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-MarkupSafe"
-checkdepends="python-pytest $depends"
short_desc="Full featured template engine (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
@@ -15,10 +14,6 @@ changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-do_check() {
- PYTHONPATH=src python2 -m pytest
-}
-
post_install() {
vlicense LICENSE.rst
# these files are valid only on Python 3.6+
From 570f7cf82e27967c304e982f7c1891fe25077c48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:47:23 +0200
Subject: [PATCH 02/28] python-SQLAlchemy: disable tests
---
srcpkgs/python-SQLAlchemy/template | 4 ++--
srcpkgs/python-pluggy/template | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 359aa5084f2b..e037cc375ba5 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -6,14 +6,14 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
-checkdepends="python3-mock python3-pytest
- python-mock python-pytest"
short_desc="SQL Toolkit and Object Relational Mapper for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.sqlalchemy.org"
distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
+# no more python2 checks
+make_check=no
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
index 13eae9e29509..91f5b58a4e4e 100644
--- a/srcpkgs/python-pluggy/template
+++ b/srcpkgs/python-pluggy/template
@@ -6,7 +6,6 @@ wrksrc="pluggy-${version}"
build_style=python2-module
hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python-pytest ${depends}"
short_desc="Minimalist production ready plugin system (Python2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -14,10 +13,6 @@ homepage="https://github.com/pytest-dev/pluggy"
distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-do_check() {
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
From 1556da0963dd30574ef447f649208963f4560b13 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:48:50 +0200
Subject: [PATCH 03/28] python-hyperlink: remove python2 checkdepends
---
srcpkgs/python-hyperlink/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 710b8eb13db8..c2e4a6e1d058 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -6,8 +6,7 @@ wrksrc="hyperlink-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-idna"
-checkdepends="python-idna python-typing python-pytest python-mock
- python3-idna python3-pytest"
+checkdepends="python3-idna python3-pytest"
short_desc="Pure-Python implementation of immutable URLs (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
From ca4de9e8c97ec99993dc604df386ce0384d26fa1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:51:57 +0200
Subject: [PATCH 04/28] python-attrs: disable python2 tests
---
srcpkgs/python-attrs/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 88779a213b05..ccb08e6678f1 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -6,8 +6,7 @@ wrksrc="attrs-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-hypothesis python3-hypothesis python-pytest
- python3-pytest python-zope.interface python3-zope.interface python3-six"
+checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -16,7 +15,6 @@ distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
do_check() {
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" python2 -m pytest
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
}
From 6a0f8ebe78c256f01ed1bdfbc0217023a9ed73c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:55:10 +0200
Subject: [PATCH 05/28] python-cffi: disable python2 tests
---
srcpkgs/python-cffi/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 5a098995a96f..642492e9cd94 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools libffi-devel"
makedepends="python-devel python3-devel libffi-devel"
depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
+checkdepends="python3-pytest python3-pycparser"
short_desc="C foreign function interface for Python2"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
@@ -25,8 +25,6 @@ do_check() {
excludes+=' and not test_wraps_from_stdlib'
excludes+=' and not test_stdcall_only_on_windows'
- PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
- python2 -m pytest c/ testing/ -x -k "$excludes"
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
python3 -m pytest c/ testing/ -x -k "$excludes"
}
From 9f8657e55c0baf3e1a67e0b44d09f54d07318a31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:56:08 +0200
Subject: [PATCH 06/28] python-six: disable python2 tests
---
srcpkgs/python-six/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index b50e793b2c9b..bae3a78bd13a 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,7 +6,7 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
-checkdepends="python-pytest python3-pytest"
+checkdepends="python3-pytest"
short_desc="Python 2 and 3 compatibility utilities (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -20,7 +20,6 @@ post_install() {
}
do_check() {
- python -m pytest
python3 -m pytest
}
From d0324001fe5ceeae7bd431f8bada3976c194c311 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:15 +0200
Subject: [PATCH 07/28] python-pytest: remove package
---
srcpkgs/python-pytest/template | 43 ----------------------------------
srcpkgs/python-pytest/update | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-pytest/template
delete mode 100644 srcpkgs/python-pytest/update
diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template
deleted file mode 100644
index 4d0f26440c72..000000000000
--- a/srcpkgs/python-pytest/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-pytest'
-pkgname=python-pytest
-version=4.6.9
-revision=3
-wrksrc="pytest-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-atomicwrites python-attrs>=17.4.0 python-funcsigs
- python-more-itertools python-pluggy>=0.12.0 python-py>=1.6.0
- python-setuptools python-pathlib2 python-six>=1.10.0
- python-wcwidth python-hypothesis python-importlib_metadata
- python-packaging"
-checkdepends="$depends python-mock"
-short_desc="Simple powerful testing with Python 2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pytest.org/en/latest/"
-changelog="https://docs.pytest.org/en/latest/changelog.html"
-distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=19e8f75eac01dd3f211edd465b39efbcbdc8fc5f7866d7dd49fedb30d8adf339
-alternatives="
- pytest:pytest:/usr/bin/pytest2
- pytest:py.test:/usr/bin/py.test2"
-
-post_patch() {
- vsed -i setup.py \
- -e '/setup_requires=/d' \
- -e "s|use_scm_version=.*|version=\"${version}\",|"
- # This merely check if pytest executable was generated
- rm testing/test_entry_points.py
-}
-
-do_check() {
- # Don't use tox, tox will use its own environment instead of system
- # package
- PYTHONPATH=$(pwd)/build/lib python2 -m pytest
-}
-
-post_install() {
- mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest2
- mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test2
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pytest/update b/srcpkgs/python-pytest/update
deleted file mode 100644
index 1ee159b4f4d9..000000000000
--- a/srcpkgs/python-pytest/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc[1-9] [5-9].*"
From 33a4232c57a3a60a39519204c34b1dce0e264c18 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:59:40 +0200
Subject: [PATCH 08/28] python-importlib_metadata: remove package
---
srcpkgs/python-importlib_metadata/template | 16 ----------------
srcpkgs/python-importlib_metadata/update | 1 -
2 files changed, 17 deletions(-)
delete mode 100644 srcpkgs/python-importlib_metadata/template
delete mode 100644 srcpkgs/python-importlib_metadata/update
diff --git a/srcpkgs/python-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template
deleted file mode 100644
index 8e7da36d3194..000000000000
--- a/srcpkgs/python-importlib_metadata/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-importlib_metadata'
-pkgname=python-importlib_metadata
-version=2.1.1
-revision=1
-wrksrc="importlib_metadata-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-zipp python-pathlib2 python-backports.configparser"
-checkdepends="${depends}"
-short_desc="Read metadata from Python packages"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="Apache-2.0"
-homepage="https://importlib-metadata.readthedocs.io/en/latest/"
-changelog="https://importlib-metadata.readthedocs.io/en/latest/history.html"
-distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=b8de9eff2b35fb037368f28a7df1df4e6436f578fa74423505b6c6a778d5b5dd
diff --git a/srcpkgs/python-importlib_metadata/update b/srcpkgs/python-importlib_metadata/update
deleted file mode 100644
index 9a186c91d98d..000000000000
--- a/srcpkgs/python-importlib_metadata/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[3-9]*"
From 0454f2506eb683afe07b54c860b4fb91cff7fc65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:04 +0200
Subject: [PATCH 09/28] python-zipp: remove package
---
srcpkgs/python-zipp/template | 19 -------------------
srcpkgs/python-zipp/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-zipp/template
delete mode 100644 srcpkgs/python-zipp/update
diff --git a/srcpkgs/python-zipp/template b/srcpkgs/python-zipp/template
deleted file mode 100644
index 8a4c44b786f0..000000000000
--- a/srcpkgs/python-zipp/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-zipp'
-pkgname=python-zipp
-version=1.2.0
-revision=2
-wrksrc="zipp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-contextlib2"
-short_desc="Pathlib-compatible Zipfile object wrapper"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="MIT"
-homepage="https://github.com/jaraco/zipp"
-changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-zipp/update b/srcpkgs/python-zipp/update
deleted file mode 100644
index 473c9b6c3296..000000000000
--- a/srcpkgs/python-zipp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.* 3.*" # require python 3
From 4e60901789ddea49bc72f7429e8f757ce160527e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:00:43 +0200
Subject: [PATCH 10/28] python-pathlib2: remove package
---
srcpkgs/python-pathlib2/template | 29 -----------------------------
srcpkgs/python3-pathlib2 | 1 -
srcpkgs/python3-pathlib2/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pathlib2/template
delete mode 120000 srcpkgs/python3-pathlib2
create mode 100644 srcpkgs/python3-pathlib2/template
diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
deleted file mode 100644
index fc4b7a31fc5f..000000000000
--- a/srcpkgs/python-pathlib2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pathlib2'
-pkgname=python-pathlib2
-version=2.3.4
-revision=6
-wrksrc="pathlib2-${version}"
-build_style=python-module
-pycompile_module="pathlib2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-scandir"
-short_desc="Object-oriented filesystem paths (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/mcmtroffaes/pathlib2"
-distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
-checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
-
-python3-pathlib2_package() {
- depends="python3-six python3-scandir"
- pycompile_module="pathlib2"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
-
-post_install() {
- vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python3-pathlib2 b/srcpkgs/python3-pathlib2
deleted file mode 120000
index bb0f70e054c1..000000000000
--- a/srcpkgs/python3-pathlib2
+++ /dev/null
@@ -1 +0,0 @@
-python-pathlib2
\ No newline at end of file
diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template
new file mode 100644
index 000000000000..9f284c9cd9b5
--- /dev/null
+++ b/srcpkgs/python3-pathlib2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pathlib2'
+pkgname=python3-pathlib2
+version=2.3.4
+revision=8
+wrksrc="pathlib2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="${depends}"
+short_desc="Object-oriented filesystem paths (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/mcmtroffaes/pathlib2"
+distfiles="${PYPI_SITE}/p/pathlib2/pathlib2-${version}.tar.gz"
+checksum=446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8
+
+post_install() {
+ vlicense LICENSE.rst
+}
From dddac087f9d7068d4a3271a3380cfd4c7c491ac3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:02 +0200
Subject: [PATCH 11/28] python-scandir: remove package, fix python3 build
---
srcpkgs/python-scandir/template | 30 ----------
srcpkgs/python3-scandir | 1 -
srcpkgs/python3-scandir/patches/py3.10.patch | 63 ++++++++++++++++++++
srcpkgs/python3-scandir/template | 19 ++++++
4 files changed, 82 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-scandir/template
delete mode 120000 srcpkgs/python3-scandir
create mode 100644 srcpkgs/python3-scandir/patches/py3.10.patch
create mode 100644 srcpkgs/python3-scandir/template
diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
deleted file mode 100644
index fb7c016c411c..000000000000
--- a/srcpkgs/python-scandir/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scandir'
-pkgname=python-scandir
-version=1.10.0
-revision=5
-wrksrc="scandir-${version}"
-build_style=python-module
-pycompile_module="scandir.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Better directory iterator and faster os.walk() (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/benhoyt/scandir"
-distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
-checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
-
-python3-scandir_package() {
- pycompile_module="scandir.py"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-scandir b/srcpkgs/python3-scandir
deleted file mode 120000
index a572ade2d3ea..000000000000
--- a/srcpkgs/python3-scandir
+++ /dev/null
@@ -1 +0,0 @@
-python-scandir
\ No newline at end of file
diff --git a/srcpkgs/python3-scandir/patches/py3.10.patch b/srcpkgs/python3-scandir/patches/py3.10.patch
new file mode 100644
index 000000000000..13f221a6e945
--- /dev/null
+++ b/srcpkgs/python3-scandir/patches/py3.10.patch
@@ -0,0 +1,63 @@
+(only includes changes to _scandir.c, others are irrelevant)
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+ 663 | char *PyStructSequence_UnnamedField = "unnamed field";
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+ from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+ 22 | extern const char * const PyStructSequence_UnnamedField;
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ .github/workflows/tests.yml | 2 +-
+ _scandir.c | 10 +++++-----
+ scandir.py | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+ return v;
+ }
+
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+ {"st_uid", "user ID of owner"},
+ {"st_gid", "group ID of owner"},
+ {"st_size", "total size, in bytes"},
+- /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++ /* The NULL is replaced with scandir_unnamed_field later. */
+ {NULL, "integer time of last access"},
+ {NULL, "integer time of last modification"},
+ {NULL, "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+ if (!billion)
+ INIT_ERROR;
+
+- stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+- stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++ stat_result_desc.fields[7].name = scandir_unnamed_field;
++ stat_result_desc.fields[8].name = scandir_unnamed_field;
++ stat_result_desc.fields[9].name = scandir_unnamed_field;
+ PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+ structseq_new = StatResultType.tp_new;
+ StatResultType.tp_new = statresult_new;
diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template
new file mode 100644
index 000000000000..8525e36bf56f
--- /dev/null
+++ b/srcpkgs/python3-scandir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scandir'
+pkgname=python3-scandir
+version=1.10.0
+revision=8
+wrksrc="scandir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Better directory iterator and faster os.walk()"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/benhoyt/scandir"
+distfiles="${PYPI_SITE}/s/scandir/scandir-${version}.tar.gz"
+checksum=4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae
+
+post_install() {
+ vlicense LICENSE.txt
+}
From c8e1de4973c25b7eb5b91f1e429429cfe328a689 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:03:32 +0200
Subject: [PATCH 12/28] python-wcwidth: remove package
---
srcpkgs/python3-wcwidth | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-wcwidth
rename srcpkgs/{python-wcwidth => python3-wcwidth}/template (51%)
diff --git a/srcpkgs/python3-wcwidth b/srcpkgs/python3-wcwidth
deleted file mode 120000
index 83fc9e89f4ea..000000000000
--- a/srcpkgs/python3-wcwidth
+++ /dev/null
@@ -1 +0,0 @@
-python-wcwidth
\ No newline at end of file
diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python3-wcwidth/template
similarity index 51%
rename from srcpkgs/python-wcwidth/template
rename to srcpkgs/python3-wcwidth/template
index a21b21883e10..6544018ac6f6 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python3-wcwidth/template
@@ -1,12 +1,13 @@
-# Template file for 'python-wcwidth'
-pkgname=python-wcwidth
+# Template file for 'python3-wcwidth'
+pkgname=python3-wcwidth
version=0.2.5
revision=4
wrksrc="wcwidth-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.functools_lru_cache"
-short_desc="Measures no. of terminal column cells of wide-character codes (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Measures no. of terminal column cells of wide-character codes"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/wcwidth"
@@ -16,12 +17,3 @@ checksum=c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
post_install() {
vlicense LICENSE
}
-
-python3-wcwidth_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From f519e41a12594b315c2ab009c126bfe9c34125c6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:18 +0200
Subject: [PATCH 13/28] python-backports.configparser: remove package
---
srcpkgs/python-backports.configparser/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports.configparser/template
diff --git a/srcpkgs/python-backports.configparser/template b/srcpkgs/python-backports.configparser/template
deleted file mode 100644
index c74f73a0bf68..000000000000
--- a/srcpkgs/python-backports.configparser/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-backports.configparser'
-pkgname=python-backports.configparser
-version=3.5.0
-revision=2
-wrksrc="configparser-${version}"
-build_style=python2-module
-pycompile_module="backports configparser.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of Python 3.x configparser module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/ambv/configparser"
-license="MIT"
-distfiles="${PYPI_SITE}/c/configparser/configparser-${version}.tar.gz"
-checksum=5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a
From 8364042a73275fa7c64618abb41986ef3bbbaf2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:37 +0200
Subject: [PATCH 14/28] python-backports.functools_lru_cache: remove package
---
.../template | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/python-backports.functools_lru_cache/template
diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template
deleted file mode 100644
index 9369a6005317..000000000000
--- a/srcpkgs/python-backports.functools_lru_cache/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-backports.functools_lru_cache'
-pkgname=python-backports.functools_lru_cache
-version=1.5
-revision=2
-wrksrc="backports.functools_lru_cache-${version}"
-build_style=python2-module
-pycompile_module="backports/functools_lru_cache.py"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of functools.lru_cache from Python 3.3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jaraco/backports.functools_lru_cache"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz"
-checksum=9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a
-
-pre_build() {
- sed -i setup.py \
- -e "/setuptools_scm/d" \
- -e "s/use_scm_version=True,/version=\"${version}\",/"
-}
-post_install() {
- # namespace provided by python-backports package
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}
From 839337045f1991ef14ea757aca8bb6830343b33b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:04:50 +0200
Subject: [PATCH 15/28] python-backports: remove package
---
srcpkgs/python-backports/template | 14 --------------
srcpkgs/python-backports/update | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-backports/template
delete mode 100644 srcpkgs/python-backports/update
diff --git a/srcpkgs/python-backports/template b/srcpkgs/python-backports/template
deleted file mode 100644
index 77409ecd82f1..000000000000
--- a/srcpkgs/python-backports/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-backports'
-pkgname=python-backports
-version=1.0
-revision=5
-wrksrc="backports-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="python"
-short_desc="Namespace for backported Python features"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://pypi.org/project/backports/"
-distfiles="https://dev.gentoo.org/~radhermit/dist/backports-${version}.tar.gz"
-checksum=ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740
diff --git a/srcpkgs/python-backports/update b/srcpkgs/python-backports/update
deleted file mode 100644
index d42937957597..000000000000
--- a/srcpkgs/python-backports/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=backports
From 28862f1617c922e512697491b2510029b28530c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:26 +0200
Subject: [PATCH 16/28] python-mock: remove package
---
srcpkgs/python-mock/template | 19 -------------------
srcpkgs/python-mock/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-mock/template
delete mode 100644 srcpkgs/python-mock/update
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
deleted file mode 100644
index 6f55cd27b769..000000000000
--- a/srcpkgs/python-mock/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-mock'
-pkgname=python-mock
-reverts="4.0.2_1 4.0.2_2"
-version=3.0.5
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-hostmakedepends="python-pbr python-setuptools"
-depends="python-funcsigs python-pbr python-setuptools python-six"
-short_desc="Rolling backport of unittest.mock for Python2"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/testing-cabal/mock"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-mock/update b/srcpkgs/python-mock/update
deleted file mode 100644
index 21e9eecbf240..000000000000
--- a/srcpkgs/python-mock/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[4-9]*" # v4+ doesn't work with Python 2
From 471a1d4e0f849c46839ef7645e87a495b262c396 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:05:53 +0200
Subject: [PATCH 17/28] python-funcsigs: remove package
---
srcpkgs/python-funcsigs/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-funcsigs/template
diff --git a/srcpkgs/python-funcsigs/template b/srcpkgs/python-funcsigs/template
deleted file mode 100644
index 404dcec51aed..000000000000
--- a/srcpkgs/python-funcsigs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-funcsigs'
-pkgname=python-funcsigs
-version=1.0.2
-revision=2
-wrksrc="funcsigs-${version}"
-build_style=python2-module
-pycompile_module="funcsigs"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the signature tools from Python 3.3's inspect module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/testing-cabal/funcsigs"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/funcsigs/funcsigs-${version}.tar.gz"
-checksum=a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50
From 5e47f896c898710a784fc3b7b1fda1a48e6bd0ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 14:37:46 +0200
Subject: [PATCH 18/28] python-hypothesis: remove package
---
srcpkgs/python-hypothesis/template | 21 ---------------------
srcpkgs/python-hypothesis/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-hypothesis/template
delete mode 100644 srcpkgs/python-hypothesis/update
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
deleted file mode 100644
index fdd629732bcd..000000000000
--- a/srcpkgs/python-hypothesis/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-hypothesis'
-pkgname=python-hypothesis
-version=4.38.2
-revision=5
-wrksrc="hypothesis-hypothesis-python-${version}"
-build_wrksrc=hypothesis-python
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-attrs python-coverage python-enum34"
-checkdepends="python-coverage python-enum34 python-pytest"
-short_desc="Python2 library for property based testing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
-distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
-
-do_check() {
- PYTHONPATH="${PWD}/build-2.7/lib" python2 -m pytest tests/py2
-}
diff --git a/srcpkgs/python-hypothesis/update b/srcpkgs/python-hypothesis/update
deleted file mode 100644
index d92e11af9555..000000000000
--- a/srcpkgs/python-hypothesis/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=hypothesis-python
From 07114fdc047ff8a6c436274ebf6be82c98394e2a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:24 +0200
Subject: [PATCH 19/28] python-contextlib2: remove package
---
srcpkgs/python-contextlib2/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-contextlib2/template
diff --git a/srcpkgs/python-contextlib2/template b/srcpkgs/python-contextlib2/template
deleted file mode 100644
index bef0e281f8f1..000000000000
--- a/srcpkgs/python-contextlib2/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-contextlib2'
-pkgname=python-contextlib2
-version=0.6.0.post1
-revision=1
-wrksrc="contextlib2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backports and enhancements for the contextlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="PSF-2.0"
-homepage="https://contextlib2.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/contextlib2/contextlib2-${version}.tar.gz"
-checksum=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
-
-post_install() {
- vlicense LICENSE.txt
-}
From 60eee2fba48db1282f81e6dbb243a35109fa17d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:11:40 +0200
Subject: [PATCH 20/28] python-more-itertools: remove package
---
srcpkgs/python-more-itertools/template | 25 -------------------------
srcpkgs/python-more-itertools/update | 1 -
2 files changed, 26 deletions(-)
delete mode 100644 srcpkgs/python-more-itertools/template
delete mode 100644 srcpkgs/python-more-itertools/update
diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template
deleted file mode 100644
index 7523a49c597c..000000000000
--- a/srcpkgs/python-more-itertools/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-more-itertools'
-pkgname=python-more-itertools
-reverts="6.0.0_1"
-version=5.0.0
-revision=3
-wrksrc="more-itertools-${version}"
-build_style=python2-module
-pycompile_module="more_itertools"
-hostmakedepends="python-setuptools"
-depends="python-six"
-checkdepends="python-six"
-short_desc="More Python2 routines for operating on itertables"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=a2dd59cdb7287d738b3c745558f0812b69b519cda21726b180b09d9d68d8b461
-
-do_check() {
- python setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-more-itertools/update b/srcpkgs/python-more-itertools/update
deleted file mode 100644
index 43c9269b0579..000000000000
--- a/srcpkgs/python-more-itertools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[6789].*" # 6.0.0 and above dropped python2 support
From 7a35f13d3172cd26c5d377eb58135b053ede8cd7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:14:57 +0200
Subject: [PATCH 21/28] python-packaging: remove package
---
srcpkgs/python-packaging/template | 19 -------------------
srcpkgs/python-packaging/update | 3 ---
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-packaging/template
delete mode 100644 srcpkgs/python-packaging/update
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
deleted file mode 100644
index aa1f64182d7d..000000000000
--- a/srcpkgs/python-packaging/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-packaging'
-pkgname=python-packaging
-version=20.4
-revision=2
-wrksrc="packaging-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-parsing python-six"
-short_desc="Core utilities for Python packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, BSD-2-Clause"
-homepage="https://github.com/pypa/packaging"
-changelog="https://raw.githubusercontent.com/pypa/packaging/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-packaging/update b/srcpkgs/python-packaging/update
deleted file mode 100644
index 3b1a41fb94a5..000000000000
--- a/srcpkgs/python-packaging/update
+++ /dev/null
@@ -1,3 +0,0 @@
-# packaging >= 20.5 drops setuptools for flit, which is py3-only;
-# prevent update hits on newer versions since they require py3 to build
-pattern="packaging-\K20\.4(\.[0-9.]+)?(?=.tar.gz)"
From 6c3a74aa9ed5ead42edeafe34e97cfb4b63d712c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:15:17 +0200
Subject: [PATCH 22/28] python-parsing: remove package
---
srcpkgs/python3-parsing | 1 -
.../template | 23 ++++++-------------
.../update | 0
3 files changed, 7 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-parsing
rename srcpkgs/{python-parsing => python3-parsing}/template (53%)
rename srcpkgs/{python-parsing => python3-parsing}/update (100%)
diff --git a/srcpkgs/python3-parsing b/srcpkgs/python3-parsing
deleted file mode 120000
index b66a41741417..000000000000
--- a/srcpkgs/python3-parsing
+++ /dev/null
@@ -1 +0,0 @@
-python-parsing
\ No newline at end of file
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python3-parsing/template
similarity index 53%
rename from srcpkgs/python-parsing/template
rename to srcpkgs/python3-parsing/template
index 524a4a2d99ee..957785125915 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python3-parsing/template
@@ -1,12 +1,12 @@
-# Template file for 'python-parsing'
-pkgname=python-parsing
+# Template file for 'python3-parsing'
+pkgname=python3-parsing
version=2.4.7
-revision=2
+revision=3
wrksrc="pyparsing-pyparsing_${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python parsing module (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python parsing module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/pyparsing/pyparsing"
@@ -17,12 +17,3 @@ checksum=6deecf4b95a49a5a9c89b4a4b1fcb73c1cba0e3265ec7b858adffcced229ba05
post_install() {
vlicense LICENSE
}
-
-python3-parsing_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python-parsing/update b/srcpkgs/python3-parsing/update
similarity index 100%
rename from srcpkgs/python-parsing/update
rename to srcpkgs/python3-parsing/update
From 617db156850297e45ec14be843b32c28c2c20b30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:01 +0200
Subject: [PATCH 23/28] python-pluggy: remove package
---
srcpkgs/python-pluggy/template | 18 ------------------
srcpkgs/python-pluggy/update | 1 -
2 files changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-pluggy/template
delete mode 100644 srcpkgs/python-pluggy/update
diff --git a/srcpkgs/python-pluggy/template b/srcpkgs/python-pluggy/template
deleted file mode 100644
index 91f5b58a4e4e..000000000000
--- a/srcpkgs/python-pluggy/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pluggy'
-pkgname=python-pluggy
-version=0.13.1
-revision=2
-wrksrc="pluggy-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Minimalist production ready plugin system (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pluggy"
-distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python-pluggy/update b/srcpkgs/python-pluggy/update
deleted file mode 100644
index 9399cb78422a..000000000000
--- a/srcpkgs/python-pluggy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[1-9]*" # 1.0.0 dropped Python 2 support
From e0a515992efa9394cdd654da865b89b6ee053376 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:17:13 +0200
Subject: [PATCH 24/28] python-atomicwrites: remove package
---
srcpkgs/python-atomicwrites/template | 29 ---------------------------
srcpkgs/python3-atomicwrites | 1 -
srcpkgs/python3-atomicwrites/template | 18 +++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-atomicwrites/template
delete mode 120000 srcpkgs/python3-atomicwrites
create mode 100644 srcpkgs/python3-atomicwrites/template
diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
deleted file mode 100644
index 389a2f4f35e1..000000000000
--- a/srcpkgs/python-atomicwrites/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-atomicwrites'
-pkgname=python-atomicwrites
-version=1.4.0
-revision=2
-wrksrc="atomicwrites-${version}"
-build_style=python-module
-pycompile_module="atomicwrites"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple Python2 API for atomic file writes"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/untitaker/python-atomicwrites"
-distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
-checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-atomicwrites_package() {
- pycompile_module="atomicwrites"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-atomicwrites b/srcpkgs/python3-atomicwrites
deleted file mode 120000
index f3821781d3ed..000000000000
--- a/srcpkgs/python3-atomicwrites
+++ /dev/null
@@ -1 +0,0 @@
-python-atomicwrites
\ No newline at end of file
diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template
new file mode 100644
index 000000000000..8e7c323662ff
--- /dev/null
+++ b/srcpkgs/python3-atomicwrites/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-atomicwrites'
+pkgname=python3-atomicwrites
+version=1.4.0
+revision=3
+wrksrc="atomicwrites-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple Python3 API for atomic file writes"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/untitaker/python-atomicwrites"
+distfiles="${PYPI_SITE}/a/atomicwrites/atomicwrites-${version}.tar.gz"
+checksum=ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
+
+post_install() {
+ vlicense LICENSE
+}
From 639117658ce58e1480f7947a9c880a36279bf105 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:18:25 +0200
Subject: [PATCH 25/28] python-py: remove package
---
srcpkgs/python-py/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/python-py/template
diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
deleted file mode 100644
index a4986bc3d631..000000000000
--- a/srcpkgs/python-py/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-py'
-pkgname=python-py
-version=1.10.0
-revision=1
-wrksrc="py-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python development support library"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/pytest-dev/py"
-changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
-distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
-
-post_install() {
- vlicense LICENSE
-}
From bd54defc8f3bfb7e7fbc7b79fe1875626dac92c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:19:12 +0200
Subject: [PATCH 26/28] python-typing: remove package
---
srcpkgs/python-typing/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/python-typing/template
diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template
deleted file mode 100644
index 4745c2b04b10..000000000000
--- a/srcpkgs/python-typing/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-typing'
-pkgname=python-typing
-version=3.6.6
-revision=2
-wrksrc="typing-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the typing module from Python 3.5+"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://docs.python.org/3/library/typing.html"
-distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz"
-checksum=4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
-
-post_install() {
- vlicense LICENSE
-}
From 44ce700a9a84fd95555b52000912bf3e0d05da02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 25 Sep 2022 15:22:07 +0200
Subject: [PATCH 27/28] python-coverage: remove package
---
srcpkgs/python-coverage/template | 26 -------------------
srcpkgs/python3-coverage | 1 -
.../patches/no-versioned-coverage.patch | 0
srcpkgs/python3-coverage/template | 18 +++++++++++++
.../update | 0
5 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-coverage/template
delete mode 120000 srcpkgs/python3-coverage
rename srcpkgs/{python-coverage => python3-coverage}/patches/no-versioned-coverage.patch (100%)
create mode 100644 srcpkgs/python3-coverage/template
rename srcpkgs/{python-coverage => python3-coverage}/update (100%)
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
deleted file mode 100644
index 89e30b058c98..000000000000
--- a/srcpkgs/python-coverage/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-coverage'
-pkgname=python-coverage
-version=5.0.3
-revision=3
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-setuptools"
-short_desc="Code coverage testing for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://bitbucket.org/ned/coveragepy"
-distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
-alternatives="coverage:coverage:/usr/bin/coverage2"
-
-python3-coverage_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="coverage:coverage:/usr/bin/coverage3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-coverage b/srcpkgs/python3-coverage
deleted file mode 120000
index 8224e07188df..000000000000
--- a/srcpkgs/python3-coverage
+++ /dev/null
@@ -1 +0,0 @@
-python-coverage
\ No newline at end of file
diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
similarity index 100%
rename from srcpkgs/python-coverage/patches/no-versioned-coverage.patch
rename to srcpkgs/python3-coverage/patches/no-versioned-coverage.patch
diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template
new file mode 100644
index 000000000000..651971884fe6
--- /dev/null
+++ b/srcpkgs/python3-coverage/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-coverage'
+pkgname=python3-coverage
+version=5.0.3
+revision=4
+wrksrc="coverage-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+checkdepends="python3-pytest-xdist python3-flaky python3-unittest-mixins"
+short_desc="Code coverage testing for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://bitbucket.org/ned/coveragepy"
+distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
+checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef
+# coverage executable needs to run for many tests
+make_check=no
diff --git a/srcpkgs/python-coverage/update b/srcpkgs/python3-coverage/update
similarity index 100%
rename from srcpkgs/python-coverage/update
rename to srcpkgs/python3-coverage/update
From 7af234797d78ac454db89a5ebc6f13ce9b2017a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Oct 2022 05:08:19 -0400
Subject: [PATCH 28/28] removed-packages: add python2 checkdepends-only
packages
---
srcpkgs/removed-packages/template | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d078711930d..03bef6a42b2f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,9 +18,9 @@ replaces="
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
- adobe-flash-plugin<=32.0.0.465_1
- adobe-flash-plugin-ppapi<=32.0.0.465_1
acme-client<=0.1.16_5
+ adobe-flash-plugin-ppapi<=32.0.0.465_1
+ adobe-flash-plugin<=32.0.0.465_1
alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
@@ -334,19 +334,28 @@ replaces="
python-PyQt4<=4.12.1_4
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
+ python-atomicwrites<=1.4.0_2
python-audit<=2.8.5_2
+ python-backports.configparser<=3.5.0_2
+ python-backports.functools_lru_cache<=1.5_2
+ python-backports<=1.0_5
python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
+ python-contextlib2<=0.6.0.post1_1
+ python-coverage<=5.0.3_3
python-crypto<=3.9.7_3
python-cryptography_vectors<=3.3.2_1
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
python-evdev<=1.2.0_5
+ python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-hypothesis<=4.38.2_5
+ python-importlib_metadata<=2.1.1_1
python-iso8601<=0.1.16_2
python-isodate<=0.6.0_5
python-jellyfish<=0.6.1_2
@@ -354,12 +363,19 @@ replaces="
python-lxml<=4.6.4_2
python-matplotlib-data<=2.2.4_2
python-matplotlib<=2.2.4_2
+ python-mock<=3.0.5_2
+ python-more-itertools<=5.0.0_3
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-packaging<=20.4_2
+ python-parsing<=2.4.7_2
+ python-pathlib2<=2.3.4_6
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
+ python-pluggy<=0.13.1_2
python-pretend<=1.0.9_5
+ python-py<=1.10.0_1
python-pycryptodome<=3.9.7_3
python-pydns<=2.3.6_4
python-pyenet<=1.3.13.post7_2
@@ -367,19 +383,24 @@ replaces="
python-pyside<=1.2.2_7
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
+ python-pytest<=4.6.9_3
python-pytz<=2021.3_2
python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-rfc6555<=0.0.0_5
+ python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-spambayes<=1.1b3_3
python-sqlite<=2.8.3_1
+ python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
python-urwid<=2.1.2_3
+ python-wcwidth<=0.2.5_4
python-xdg<=0.27_2
python-xlib<=0.29_1
+ python-zipp<=1.2.0_2
python3-Django<=3.0.7_2
python3-SPARQLWrapper<=1.8.4_4
python3-aiohttp-cors2<=0.7.0_3
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: remove python2 checkdepends
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
` (7 preceding siblings ...)
2022-10-06 10:09 ` classabbyamp
@ 2022-10-06 10:29 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-10-06 10:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
There's a merged pull request on the void-packages repository
remove python2 checkdepends
https://github.com/void-linux/void-packages/pull/39457
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
~~TODO: add each removed package to removed-packages~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-10-06 10:29 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-25 13:26 [PR PATCH] remove python2 checkdepends paper42
2022-09-26 23:22 ` paper42
2022-10-06 9:10 ` [PR PATCH] [Updated] " classabbyamp
2022-10-06 9:11 ` [PR REVIEW] " classabbyamp
2022-10-06 9:23 ` [PR PATCH] [Updated] " classabbyamp
2022-10-06 9:34 ` classabbyamp
2022-10-06 9:44 ` classabbyamp
2022-10-06 9:54 ` classabbyamp
2022-10-06 10:09 ` classabbyamp
2022-10-06 10:29 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).