Re: [PR PATCH] [Updated] Drop python3.8 backported package

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages drop-python3.8-backport
https://github.com/void-linux/void-packages/pull/17755

Drop python3.8 backported package
- zipp, importlib_metadata, mock are back-ported package.

- Drop them since we're in Python 3.8 now.

- ./xbps-src check passed

A patch file from https://github.com/void-linux/void-packages/pull/17755.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-drop-python3.8-backport-17755.patch --]
[-- Type: text/x-diff, Size: 10002 bytes --]

From fc18251ba0cf651f2a8ea2ba554c6b01ed8a99e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:22:14 +0700
Subject: [PATCH 1/6] 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 08fc71c58caf51117f7c8d4ec9df9fcc027b2c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:23:41 +0700
Subject: [PATCH 2/6] 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..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() {

From c07885865d3ce66b67cee059f599d2ac6be4758b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:26:36 +0700
Subject: [PATCH 3/6] 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 <chocimier@tlen.pl>"

From a1d2872f059f6bbd41eeaf9a6a83d2440924ac49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:37:40 +0700
Subject: [PATCH 4/6] 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 <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 8b59e48fdfe0e43c05955082144007d5a4a4a1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:44:34 +0700
Subject: [PATCH 5/6] python-zipp: drop package

zipp is a backport of Path object.
See: https://pypi.org/project/zipp/

We don't need python3-zipp anymore, now.
And no-packages depends on python2 version, remove them all together.
---
 srcpkgs/python-zipp           |  1 -
 srcpkgs/python3-zipp/template | 30 ------------------------------
 2 files changed, 31 deletions(-)
 delete mode 120000 srcpkgs/python-zipp
 delete mode 100644 srcpkgs/python3-zipp/template

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/python3-zipp/template
deleted file mode 100644
index c1eecbb47e3..00000000000
--- a/srcpkgs/python3-zipp/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python3-zipp'
-pkgname=python3-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"
-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=3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e
-
-post_install() {
-	vlicense LICENSE
-}
-
-python-zipp_package() {
-	depends=python
-	short_desc+=" - Python 2"
-	pkg_install() {
-		vmove "usr/lib/python2.7"
-		vlicense LICENSE
-	}
-}

From f6ae9a273eab9a1f94bb4459bcf8d0ec5ca93399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 28 Jan 2020 10:47:31 +0700
Subject: [PATCH 6/6] 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 <chocimier@tlen.pl>"
 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"
-	}
-}