From 14c187262d80b27eeac5edc92bd00e8db0303708 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Tue, 24 Dec 2019 20:37:56 +0700 Subject: [PATCH 1/2] 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 +++++-------------- srcpkgs/python3-astroid/template | 5 ++-- srcpkgs/python3-pluggy/template | 5 ++-- srcpkgs/python3-pytest/template | 7 +++--- srcpkgs/tox/template | 4 ++-- 6 files changed, 15 insertions(+), 31 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..5f91f63c225 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} python-packaging" 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" - } -} diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 7e85b0d4949..03ba5ed2515 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,16 +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-py python3-pluggy python3-more-itertools python3-parsing python3-zipp" short_desc="Abstract syntax tree for Python3" maintainer="Alessio Sergi " 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 " diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 5c6ebe98970..022914f5f1f 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 py38 } post_install() { 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 686043d6656ed0ceeee6274601da9a37dae04f5f Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Tue, 24 Dec 2019 20:48:44 +0700 Subject: [PATCH 2/2] python3-zipp: drop package zipp is a backport of Path object. See: https://pypi.org/project/zipp/ --- srcpkgs/python-zipp | 1 - .../{python3-zipp => python-zipp}/template | 19 +++++-------------- srcpkgs/python3-astroid/template | 6 ++---- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 120000 srcpkgs/python-zipp rename srcpkgs/{python3-zipp => python-zipp}/template (62%) 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 62% rename from srcpkgs/python3-zipp/template rename to srcpkgs/python-zipp/template index c1eecbb47e3..410e7a49076 100644 --- a/srcpkgs/python3-zipp/template +++ b/srcpkgs/python-zipp/template @@ -1,13 +1,13 @@ -# 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 +build_style=python2-module pycompile_module="zipp.py" -hostmakedepends="python-setuptools python3-setuptools" -depends="python3" +hostmakedepends="python-setuptools" +depends="python" short_desc="Pathlib-compatible Zipfile object wrapper" maintainer="Piotr Wójcik " license="MIT" @@ -19,12 +19,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 - } -} diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 03ba5ed2515..e06d54f1d84 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -6,11 +6,9 @@ archs=noarch wrksrc="astroid-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-six python3-lazy-object-proxy python3-wrapt - python3-typed-ast" +depends="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-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"