From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Drop python3.8 backported package
Date: Tue, 24 Dec 2019 17:50:36 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17755@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
There is a new 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: 14681 bytes --]
From 61ca7ac6ec4c93480c978b79954f10a075beca48 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 20:37:56 +0700
Subject: [PATCH 1/3] 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 | 18 +++++-------------
srcpkgs/python3-astroid/template | 4 ++--
srcpkgs/python3-pluggy/template | 4 ++--
srcpkgs/python3-pytest/template | 6 +++---
srcpkgs/tox/template | 4 ++--
6 files changed, 14 insertions(+), 23 deletions(-)
delete mode 120000 srcpkgs/python-importlib_metadata
rename srcpkgs/{python3-importlib_metadata => python-importlib_metadata}/template (62%)
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 62%
rename from srcpkgs/python3-importlib_metadata/template
rename to srcpkgs/python-importlib_metadata/template
index fa80b295033..2724967c6bd 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=2
archs=noarch
wrksrc="importlib_metadata-${version}"
-build_style=python-module
+build_style=python2-module
pycompile_module=importlib_metadata
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python3-zipp"
+hostmakedepends="python-setuptools"
+depends="python-zipp"
checkdepends="${depends}"
short_desc="Read metadata from Python packages"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,11 +16,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
-
-python-importlib_metadata_package() {
- depends=python-zipp
- 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..3abf82e0b6a 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,7 +1,7 @@
# 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
@@ -10,7 +10,7 @@ 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 <al3hex@gmail.com>"
diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index b0dadf4585f..2e53ee5317c 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,13 +1,13 @@
# 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>"
diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 5c6ebe98970..1e6d57abd24 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,14 +1,14 @@
# 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 +29,7 @@ post_patch() {
}
do_check() {
- tox -e py36
+ tox -e py38
}
post_install() {
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 1dbab31033c..bc4a80de76d 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,10 +1,10 @@
# Template file for 'tox'
pkgname=tox
version=3.14.2
-revision=2
+revision=3
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 3acd8400e8184bb393cd4e32a0cd3a133ef66af3 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 20:48:44 +0700
Subject: [PATCH 2/3] 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 <chocimier@tlen.pl>"
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 3abf82e0b6a..bb0c4690839 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -7,11 +7,9 @@ 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"
+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 <al3hex@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From ef92c2126057666c2da6f5e07af9cf24effa18d0 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 23:38:25 +0700
Subject: [PATCH 3/3] python3-mock: drop package
See: https://mock.readthedocs.io/en/latest/
---
.../patches/remove-unecessary.patch | 7 +++++++
srcpkgs/backblaze-b2/template | 5 ++---
srcpkgs/certbot/patches/remove-mock.patch | 10 ++++++++++
srcpkgs/certbot/template | 7 ++++---
srcpkgs/python-b2sdk/template | 5 ++---
srcpkgs/python3-mock/template | 18 ------------------
srcpkgs/python3-pytest/template | 2 +-
7 files changed, 26 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/backblaze-b2/patches/remove-unecessary.patch
create mode 100644 srcpkgs/certbot/patches/remove-mock.patch
delete mode 100644 srcpkgs/python3-mock/template
diff --git a/srcpkgs/backblaze-b2/patches/remove-unecessary.patch b/srcpkgs/backblaze-b2/patches/remove-unecessary.patch
new file mode 100644
index 00000000000..8b8322953f7
--- /dev/null
+++ b/srcpkgs/backblaze-b2/patches/remove-unecessary.patch
@@ -0,0 +1,7 @@
+--- requirements-test.txt.orig 2019-12-24 22:38:37.224988498 +0700
++++ requirements-test.txt 2019-12-24 22:38:42.742010931 +0700
+@@ -1,4 +1,3 @@
+-mock
+ pyflakes; python_version >= '2.7'
+ importlib; python_version == '2.6'
+ yapf
diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index ef7fbca68b6..16e520836c3 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
# Template file for 'backblaze-b2'
pkgname=backblaze-b2
version=1.4.2
-revision=3
+revision=4
archs=noarch
wrksrc="b2-${version}"
build_style=python3-module
@@ -9,8 +9,7 @@ pycompile_module="b2"
hostmakedepends="python3-setuptools"
depends="python3-logfury python3-Arrow python3-requests python3-six
python3-tqdm python-b2sdk"
-checkdepends="python3-pytest $depends python3-pyflakes python3-mock
- python3-dateutil python3-nose"
+checkdepends="$depends python3-pyflakes python3-dateutil python3-nose"
short_desc="Command Line Interface for Backblaze's B2 storage service"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
diff --git a/srcpkgs/certbot/patches/remove-mock.patch b/srcpkgs/certbot/patches/remove-mock.patch
new file mode 100644
index 00000000000..d693cf9e1c3
--- /dev/null
+++ b/srcpkgs/certbot/patches/remove-mock.patch
@@ -0,0 +1,10 @@
+--- setup.py.orig 2019-12-24 23:33:49.732657030 +0700
++++ setup.py 2019-12-24 23:33:56.257683943 +0700
+@@ -45,7 +45,6 @@
+ # 1.1.0+ is required to avoid the warnings described at
+ # https://github.com/certbot/josepy/issues/13.
+ 'josepy>=1.1.0',
+- 'mock',
+ 'parsedatetime>=1.3', # Calendar.parseDT
+ 'pyrfc3339',
+ 'pytz',
diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 008d7610767..4ec2f4f7c90 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,15 +1,16 @@
# Template file for 'certbot'
pkgname=certbot
version=1.0.0
-revision=2
+revision=3
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-acme python3-ConfigArgParse python3-configobj
python3-cryptography python3-josepy python3-pyrfc3339 python3-pytz
python3-zope.component python3-zope.interface python3-parsedatetime
- python3-zope.hookable python3-mock python3-zope.deferredimport
- python3-zope.deprecation"
+ python3-zope.hookable python3-zope.deferredimport python3-zope.deprecation"
+checkdepends="$depends python3-py python3-pluggy python3-wcwidth
+ python3-more-itertools python3-pytest python3-distro"
short_desc="Let's Encrypt certificate renewal automation utility"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 06cbde21a69..0e7d3764a83 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -3,15 +3,14 @@
pkgname=python-b2sdk
reverts="1.0.0_1 1.0.2_1"
version=0.1.8
-revision=3
+revision=4
archs=noarch
wrksrc="b2sdk-${version}"
build_style=python3-module
pycompile_module="b2sdk"
hostmakedepends="python3-setuptools"
depends="python3-logfury python3-Arrow python3-requests python3-six"
-checkdepends="python3-pytest $depends python3-dateutil python3-nose
- python3-mock python3-tqdm python3-pyflakes"
+checkdepends="$depends python3-dateutil python3-nose python3-tqdm python3-pyflakes"
short_desc="Backblaze's B2 Python SDK"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template
deleted file mode 100644
index ca698f51980..00000000000
--- a/srcpkgs/python3-mock/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python3-mock'
-pkgname=python3-mock
-version=3.0.5
-revision=2
-archs=noarch
-wrksrc="mock-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-short_desc="Python3 mock library"
-maintainer="Alex Childs <misuchiru03+void@gmail.com>"
-license="BSD-2-Clause"
-homepage="http://mock.readthedocs.org/en/latest/"
-distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 1e6d57abd24..f7317ef7fd1 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -9,7 +9,7 @@ pycompile_module="_pytest pytest.py"
hostmakedepends="python3-setuptools"
depends="python3-py python3-packaging python3-attrs python3-more-itertools
python3-atomicwrites python3-pluggy python3-wcwidth"
-checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock
+checkdepends="$depends python3-argcomplete python3-hypothesis
python3-nose python3-requests python3-parsing tox"
short_desc="Simple powerful testing with Python 3"
maintainer="Orphaned <orphan@voidlinux.org>"
next reply other threads:[~2019-12-24 16:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 16:50 voidlinux-github [this message]
2019-12-24 16:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-26 13:30 ` voidlinux-github
2020-01-11 2:27 ` [PR PATCH] [Updated] [wip] " voidlinux-github
2020-01-11 2:38 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-27 19:52 ` voidlinux-github
2020-01-28 3:47 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-28 4:00 ` voidlinux-github
2020-01-29 2:54 ` voidlinux-github
2020-01-29 18:19 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17755@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).