From 05b4a03d23fc0b7455be9444d2c6200a33b43bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:22:14 +0700 Subject: [PATCH 1/7] tox: drop python3.8 backported deps importlib_metadata is backport of Python 3.8's standard library for older Python. We've upgraded to Python 3.8, drop it. See: https://importlib-metadata.readthedocs.io/en/latest/ --- srcpkgs/tox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template index d372885e460..2f413712328 100644 --- a/srcpkgs/tox/template +++ b/srcpkgs/tox/template @@ -1,10 +1,10 @@ # Template file for 'tox' pkgname=tox version=3.14.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-filelock python3-importlib_metadata python3-packaging +depends="python3-filelock python3-packaging python3-pluggy python3-pytest python3-toml python3-virtualenv" checkdepends="${depends} python3-flaky python3-pathlib2" short_desc="Generic virtualenv management and test command line tool" From c1fecaf64125ff52663cb8e1e975644ea7e88707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:23:41 +0700 Subject: [PATCH 2/7] pytest3: drop python3.8 backported deps importlib_metadata is backport of Python 3.8's standard library for older Python. We've upgraded to Python 3.8, drop it. See: https://importlib-metadata.readthedocs.io/en/latest/ --- srcpkgs/python3-pytest/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 5c6ebe98970..71ccb76537f 100644 --- a/srcpkgs/python3-pytest/template +++ b/srcpkgs/python3-pytest/template @@ -1,14 +1,13 @@ # Template file for 'python3-pytest' pkgname=python3-pytest version=5.3.2 -revision=2 +revision=3 archs=noarch wrksrc="${pkgname/python3-//}-${version}" build_style=python3-module -pycompile_module="_pytest pytest.py" hostmakedepends="python3-setuptools" depends="python3-py python3-packaging python3-attrs python3-more-itertools - python3-atomicwrites python3-pluggy python3-importlib_metadata python3-wcwidth" + python3-atomicwrites python3-pluggy python3-wcwidth" checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock python3-nose python3-requests python3-parsing tox" short_desc="Simple powerful testing with Python 3" @@ -29,7 +28,7 @@ post_patch() { } do_check() { - tox -e py36 + tox -e "py${py3_ver/./}" } post_install() { From cc618def183fceb3170e2c3a076e9a8853d42838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:26:36 +0700 Subject: [PATCH 3/7] python3-pluggy: drop python3.8 backported deps importlib_metadata is backport of Python 3.8's standard library for older Python. We've upgraded to Python 3.8, drop it. See: https://importlib-metadata.readthedocs.io/en/latest/ --- srcpkgs/python3-pluggy/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template index b0dadf4585f..d5baa4e7406 100644 --- a/srcpkgs/python3-pluggy/template +++ b/srcpkgs/python3-pluggy/template @@ -1,13 +1,12 @@ # Template file for 'python3-pluggy' pkgname=python3-pluggy version=0.13.1 -revision=2 +revision=3 archs=noarch wrksrc="pluggy-${version}" build_style=python3-module -pycompile_module="pluggy" hostmakedepends="python3-setuptools" -depends="python3-importlib_metadata" +depends="python3" checkdepends="python3-pytest ${depends}" short_desc="Minimalist production ready plugin system (Python3)" maintainer="Piotr Wójcik " From b6f73e38d07b1e10605d44258445c1823d107b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:37:40 +0700 Subject: [PATCH 4/7] python3-astroid: drop python3.8 backported checkdepends importlib_metadata is backport of Python 3.8's standard library for older Python. We've upgraded to Python 3.8, drop it. See: https://importlib-metadata.readthedocs.io/en/latest/ python3-astroid doesn't need zipp for testing, and zipp is a backported package itself. Drop that check-deps, too. --- srcpkgs/python3-astroid/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 7e85b0d4949..261dfacd70c 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,17 +1,15 @@ # Template file for 'python3-astroid' pkgname=python3-astroid version=2.3.3 -revision=2 +revision=3 archs=noarch wrksrc="astroid-${version}" build_style=python3-module -pycompile_module="astroid" hostmakedepends="python3-setuptools" depends="python3-six python3-lazy-object-proxy python3-wrapt python3-typed-ast" checkdepends="$depends python3-attrs python3-pytest python3-wcwidth - python3-py python3-pluggy python3-more-itertools python3-importlib_metadata - python3-parsing python3-zipp" + python3-py python3-pluggy python3-more-itertools python3-parsing" short_desc="Abstract syntax tree for Python3" maintainer="Alessio Sergi " license="GPL-2.0-or-later, LGPL-2.1-or-later" From 9f09ab94b0a44d6fb31ceacc02aefd6b21aeca26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:44:34 +0700 Subject: [PATCH 5/7] python3-zipp: drop package zipp is a backport of Path object. See: https://pypi.org/project/zipp/ We don't need python3-zipp anymore, now. --- srcpkgs/python-zipp | 1 - .../{python3-zipp => python-zipp}/template | 20 +++++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/python-zipp rename srcpkgs/{python3-zipp => python-zipp}/template (59%) diff --git a/srcpkgs/python-zipp b/srcpkgs/python-zipp deleted file mode 120000 index 98b04d0e844..00000000000 --- a/srcpkgs/python-zipp +++ /dev/null @@ -1 +0,0 @@ -python3-zipp \ No newline at end of file diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python-zipp/template similarity index 59% rename from srcpkgs/python3-zipp/template rename to srcpkgs/python-zipp/template index c1eecbb47e3..600d9006609 100644 --- a/srcpkgs/python3-zipp/template +++ b/srcpkgs/python-zipp/template @@ -1,13 +1,12 @@ -# Template file for 'python3-zipp' -pkgname=python3-zipp +# Template file for 'python-zipp' +pkgname=python-zipp version=0.6.0 revision=2 archs=noarch wrksrc="zipp-${version}" -build_style=python-module -pycompile_module="zipp.py" -hostmakedepends="python-setuptools python3-setuptools" -depends="python3" +build_style=python2-module +hostmakedepends="python-setuptools" +depends="python" short_desc="Pathlib-compatible Zipfile object wrapper" maintainer="Piotr Wójcik " license="MIT" @@ -19,12 +18,3 @@ checksum=3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e post_install() { vlicense LICENSE } - -python-zipp_package() { - depends=python - short_desc+=" - Python 2" - pkg_install() { - vmove "usr/lib/python2.7" - vlicense LICENSE - } -} From 96a542697996088e8f9d0426910b53ac14a09819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:47:31 +0700 Subject: [PATCH 6/7] python3-importlib_metadata: drop package importlib_metadata is backport of Python 3.8's standard library for older Python. We've upgraded to Python 3.8, drop it. See: https://importlib-metadata.readthedocs.io/en/latest/ --- srcpkgs/python-importlib_metadata | 1 - .../template | 24 +++++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 120000 srcpkgs/python-importlib_metadata rename srcpkgs/{python3-importlib_metadata => python-importlib_metadata}/template (51%) diff --git a/srcpkgs/python-importlib_metadata b/srcpkgs/python-importlib_metadata deleted file mode 120000 index 211acaa67bf..00000000000 --- a/srcpkgs/python-importlib_metadata +++ /dev/null @@ -1 +0,0 @@ -python3-importlib_metadata \ No newline at end of file diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python-importlib_metadata/template similarity index 51% rename from srcpkgs/python3-importlib_metadata/template rename to srcpkgs/python-importlib_metadata/template index bd1aa83266f..ee0b9e949e0 100644 --- a/srcpkgs/python3-importlib_metadata/template +++ b/srcpkgs/python-importlib_metadata/template @@ -1,13 +1,13 @@ -# Template file for 'python3-importlib_metadata' -pkgname=python3-importlib_metadata +# Template file for 'python-importlib_metadata' +pkgname=python-importlib_metadata version=1.2.0 revision=3 archs=noarch wrksrc="importlib_metadata-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python3-zipp" -checkdepends="${depends} python3-packaging" +build_style=python2-module +hostmakedepends="python-setuptools" +depends="python-zipp" +checkdepends="${depends}" short_desc="Read metadata from Python packages" maintainer="Piotr Wójcik " license="Apache-2.0" @@ -15,15 +15,3 @@ homepage="https://importlib-metadata.readthedocs.io/en/latest/" changelog="https://importlib-metadata.readthedocs.io/en/latest/changelog%20(links).html" distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz" checksum=41e688146d000891f32b1669e8573c57e39e5060e7f5f647aa617cd9a9568278 - -do_check() { - python3 setup.py test -} - -python-importlib_metadata_package() { - depends="python-zipp python-backports.configparser python-contextlib2" - short_desc="${short_desc/Python/Python 2/}" - pkg_install() { - vmove "usr/lib/python2.7" - } -} From bd223dc5ea83f012d9c520fe1ebc360247973a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 28 Jan 2020 10:59:03 +0700 Subject: [PATCH 7/7] python3-pytest: update to 5.3.4. --- srcpkgs/python3-pytest/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 71ccb76537f..e3c050d1f35 100644 --- a/srcpkgs/python3-pytest/template +++ b/srcpkgs/python3-pytest/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest' pkgname=python3-pytest -version=5.3.2 -revision=3 +version=5.3.4 +revision=1 archs=noarch wrksrc="${pkgname/python3-//}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ license="MIT" homepage="https://docs.pytest.org/en/latest/" changelog="https://docs.pytest.org/en/latest/changelog.html" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa +checksum=1d122e8be54d1a709e56f82e2d85dcba3018313d64647f38a91aec88c239b600 alternatives=" pytest:pytest:/usr/bin/pytest3 pytest:py.test:/usr/bin/py.test3"