[gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/files/, dev-python/pbr/
commit: 6dbbe2744e0d164599a517363ed03a7d748b95ff
Author: Michał Górny gentoo org>
AuthorDate: Wed Nov 29 10:06:55 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Nov 29 10:06:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbbe274
dev-python/pbr: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pbr/Manifest| 1 -
.../pbr/files/pbr-5.11.1-importlib-suffixes.patch | 41
dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch | 32 -
dev-python/pbr/pbr-5.11.1.ebuild | 77 --
4 files changed, 151 deletions(-)
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index de7bc8879b9e..3d2779411bd6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,2 +1 @@
-DIST pbr-5.11.1.tar.gz 127597 BLAKE2B
4ed433f271b4cbed3e7baca66cbeef057d575b7b061507c45a65ba93704edbed7b6f8668e9b9766f03079aaf06dbd6c394960c1c528b1beb992db65d0c3b89e4
SHA512
466dc5ce2622c43451186698f00d405141878449ffe9f7771b0057e8356bf12b426a9bfefff7e5843f1b3f963af3ffc9c4a42fa91a9407b79617abea046ff438
DIST pbr-6.0.0.tar.gz 123150 BLAKE2B
ed41fcf9febc11fe664d3045a8ac01f7a549f770e359b29045508653bffa838d91797c4aec5d5d1eba97907e83fb199f78afa4fd6f0b6be6b93b2e5f781d4425
SHA512
35cb184b02c9bc38e839e652d1f114197b2a82255f824253e15a07dee1d19823ab4f2fb17b1f4376c775295f533e006cb58136ee978f9989e98a3f782120
diff --git a/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
b/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
deleted file mode 100644
index 27609131fc59..
--- a/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Subject: [PATCH] Replace imp with importlib.machinery
-
-The imp was removed in Python 3.12 [1]. This commit replaces
-get_suffixes() method call with _SUFFIXES array from imprtlib.machinery.
-
-[1] https://github.com/python/cpython/issues/98040
-
-
-This is original patch submitted to Github mirror, it was later resubmitted to
-upstream Gerrit, where they are taking care of Python2.7. We can stick with
-this version of patch for now because we don't care about py2.7 anymore.
-
-Original-PR: https://github.com/openstack/pbr/pull/22
-Upstream-PR: https://review.opendev.org/c/openstack/pbr/+/884789
-
-diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
-index c719d1e..068bab7 100644
a/pbr/tests/test_packaging.py
-+++ b/pbr/tests/test_packaging.py
-@@ -40,7 +40,7 @@
-
- import email
- import email.errors
--import imp
-+import importlib
- import os
- import re
- import sysconfig
-@@ -1217,7 +1217,7 @@ def get_soabi():
- # NOTE(sigmavirus24): PyPy only added support for the SOABI config var
- # to sysconfig in 2015. That was well after 2.2.1 was published in the
- # Ubuntu 14.04 archive.
--for suffix, _, _ in imp.get_suffixes():
-+for suffix, _, _ in importlib.machinery._SUFFIXES:
- if suffix.startswith('.pypy') and suffix.endswith('.so'):
- soabi = suffix.split('.')[1]
- break
---
-2.39.2
-
diff --git a/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch
b/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch
deleted file mode 100644
index 0cdb1fe48ec3..
--- a/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/pbr/tests/test_core.py b/pbr/tests/test_core.py
-index edb7c7b..1730c4f 100644
a/pbr/tests/test_core.py
-+++ b/pbr/tests/test_core.py
-@@ -78,6 +78,7 @@ class TestCore(base.BaseTestCase):
- assert stdout == 'packaging, distutils, setuptools'
-
- def test_setup_py_build_sphinx(self):
-+self.skipTest("broken with sphinx-7, obsolete")
- stdout, _, return_code = self.run_setup('build_sphinx')
- self.assertEqual(0, return_code)
-
-diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
-index 4307708..ea5bd3d 100644
a/pbr/tests/test_setup.py
-+++ b/pbr/tests/test_setup.py
-@@ -231,6 +231,7 @@ class BaseSphinxTest(base.BaseTestCase):
-
- def setUp(self):
- super(BaseSphinxTest, self).setUp()
-+self.skipTest("broken with sphinx-7, obsolete")
-
- # setup_command requires the Sphinx instance to have some
- # attributes that aren't set normally with the way we use the
-@@ -379,6 +380,7 @@ class APIAutoDocTest(base.BaseTestCase):
-
- def setUp(self):
- super(APIAutoDocTest, self).setUp()
-+self.skipTest("broken with sphinx-7, obsolete")
-
- # setup_command requires the Sphinx instance to have some
- # attributes that aren't set normally with the way we use the
diff --git a/dev-python/pbr/pbr-5.11.1.ebuild b/dev-python/pbr/pbr-5.11.1.ebuild
deleted file mode 100644
index 11a84785af21..
--- a/dev-python/pbr/pbr-5.11.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-#
[gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/files/, dev-python/pbr/
commit: 48b5e659f3b13315b05445a6d2ddf11e02fdb2ad
Author: Petr Vaněk atlas cz>
AuthorDate: Tue May 30 21:22:25 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed May 31 10:49:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b5e659
dev-python/pbr: enable py3.12
- One test source file needs a patch due to removed library in py3.12,
the patch was sent to github mirror[1] and later resend to
upstream[2].
- Tests fail with dev-python/sphinx-7, because build_sphinx hook in
setup.py was removed [3], sphinx is now limmited to
https://github.com/openstack/pbr/pull/22
[2] https://review.opendev.org/c/openstack/pbr/+/884789
[3] https://bugs.launchpad.net/pbr/+bug/2018453
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Michał Górny gentoo.org>
.../pbr/files/pbr-5.11.1-importlib-suffixes.patch | 41 ++
dev-python/pbr/pbr-5.11.1.ebuild | 19 +++---
2 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
b/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
new file mode 100644
index ..27609131fc59
--- /dev/null
+++ b/dev-python/pbr/files/pbr-5.11.1-importlib-suffixes.patch
@@ -0,0 +1,41 @@
+Subject: [PATCH] Replace imp with importlib.machinery
+
+The imp was removed in Python 3.12 [1]. This commit replaces
+get_suffixes() method call with _SUFFIXES array from imprtlib.machinery.
+
+[1] https://github.com/python/cpython/issues/98040
+
+---
+
+This is original patch submitted to Github mirror, it was later resubmitted to
+upstream Gerrit, where they are taking care of Python2.7. We can stick with
+this version of patch for now because we don't care about py2.7 anymore.
+
+Original-PR: https://github.com/openstack/pbr/pull/22
+Upstream-PR: https://review.opendev.org/c/openstack/pbr/+/884789
+
+diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
+index c719d1e..068bab7 100644
+--- a/pbr/tests/test_packaging.py
b/pbr/tests/test_packaging.py
+@@ -40,7 +40,7 @@
+
+ import email
+ import email.errors
+-import imp
++import importlib
+ import os
+ import re
+ import sysconfig
+@@ -1217,7 +1217,7 @@ def get_soabi():
+ # NOTE(sigmavirus24): PyPy only added support for the SOABI config var
+ # to sysconfig in 2015. That was well after 2.2.1 was published in the
+ # Ubuntu 14.04 archive.
+-for suffix, _, _ in imp.get_suffixes():
++for suffix, _, _ in importlib.machinery._SUFFIXES:
+ if suffix.startswith('.pypy') and suffix.endswith('.so'):
+ soabi = suffix.split('.')[1]
+ break
+--
+2.39.2
+
diff --git a/dev-python/pbr/pbr-5.11.1.ebuild b/dev-python/pbr/pbr-5.11.1.ebuild
index 016fd4a7679a..5448662cdd64 100644
--- a/dev-python/pbr/pbr-5.11.1.ebuild
+++ b/dev-python/pbr/pbr-5.11.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{9..11} )
+PYTHON_TESTED=( python3_{10..12} )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
PYTHON_REQ_USE="threads(+)"
@@ -24,9 +24,14 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k
~mips ppc ppc64 ~riscv
RDEPEND="
>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
"
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and
https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions...
https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and
+# https://bugs.gentoo.org/show_bug.cgi?id=561038 docutils is needed for sphinx
+# exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 stestr is run as
+# external tool.
+#
+# https://bugs.launchpad.net/pbr/+bug/2018453
BDEPEND="
test? (
$(python_gen_cond_dep '
@@ -34,7 +39,7 @@ BDEPEND="
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
+ =dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
@@ -44,6 +49,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${P}-importlib-suffixes.patch"
+)
+
distutils_enable_tests unittest
python_prepare_all() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/files/, dev-python/pbr/
commit: f154c6ff1114a45204f0081bd5a548a232c2363c Author: Justin Lecher gentoo org> AuthorDate: Mon Nov 23 09:56:19 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 23 10:05:31 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f154c6ff dev-python/pbr: Drop old obsoletes: Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=547342 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=551596 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/pbr/Manifest | 9 dev-python/pbr/files/pbr-1.4.0_no-git.patch | 43 -- dev-python/pbr/pbr-0.10.8.ebuild| 64 --- dev-python/pbr/pbr-0.11.0.ebuild| 66 dev-python/pbr/pbr-0.8.2.ebuild | 52 -- dev-python/pbr/pbr-1.0.1.ebuild | 67 dev-python/pbr/pbr-1.1.1.ebuild | 68 - dev-python/pbr/pbr-1.2.0.ebuild | 67 dev-python/pbr/pbr-1.3.0.ebuild | 65 --- dev-python/pbr/pbr-1.6.0.ebuild | 65 --- dev-python/pbr/pbr-1.7.0.ebuild | 65 --- dev-python/pbr/pbr-1.8.0.ebuild | 68 - 12 files changed, 699 deletions(-) diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest index c3325d6..e57b0ea 100644 --- a/dev-python/pbr/Manifest +++ b/dev-python/pbr/Manifest @@ -1,11 +1,2 @@ -DIST pbr-0.10.8.tar.gz 82952 SHA256 a741650c697abe9dd3da00039a57a45a15a6eed017a16f6b7e4c0161fae2b4b2 SHA512 d79455288657ca07e38a64393d54bda8f88b75242b929ea9f88ac809ba88fffa4793eba0459cae368d822164de5a89721c77fadd05ab624db5897f6cf447b1f4 WHIRLPOOL 621f34852dc31cd149422a36fc0416fdc8640f9103439267f9b6f117a80c5dd949fab18287c10c5d5022248812b792f83766b32a62608d42d8b08066c890753e -DIST pbr-0.11.0.tar.gz 94347 SHA256 d7f0d69aef367a764d69a4728afd966025ce9394d6029a924ef838ecdf592f6d SHA512 6ddcbc39b25e57d20108f72334934f5243d397e2b5316ad26bdbdf32ae6e5bed0ad6fcb47d8e92d6c73a9bd369c463a962cae9fce5800096dd819f2ce58a045b WHIRLPOOL 0f239031cd89fde32f92b792c5e8d7b030644cd277cab6492028a75a5b0e2c8610ac2cf908fd644998663b21bb1a188147a1be0727d60726d4ba5c0edc0ddae5 DIST pbr-0.8.2.tar.gz 77790 SHA256 eef2ace8d65d5902582cbc9ad3b2ecff0e86a6f90ad4837d8b17d568dd9dd20e SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a WHIRLPOOL d6331fcd6e7d4eb750e3285e92fd21dfdfbb054b880f954156d1e781025a0c0e1c464e0c23cad587799ceba787928af092d34071eb0a5c4595b0e8aa6db52ff0 -DIST pbr-1.0.1.tar.gz 96438 SHA256 fc3d19ab844647388cc13a3df403bda872d2fc16662803d0ebcc1787d3645552 SHA512 4c4d623a558761edb5724ccb55122bf37a57a2ef48c5a2788df0d564d913a0aa59887f12da698d019e2636d70e92f45002520aeb6b7401f4b47d10c4c76b7567 WHIRLPOOL 1c08bad2d47e3805d59464a62365423fdd46a711d3ca860375962af2ba899d8e8165912f28d3c35957554116a466cbb16c57272a24eeba73d8ce0ca417c23837 -DIST pbr-1.1.1.tar.gz 97607 SHA256 3d63cc8e145e5e20624859d6453d783ae1451704483ae23d3315041d65e4d423 SHA512 bf997b85ef1b1f3ff51050ca9314f48ffd3119ba0da3acfe0e97b8498eb4af5137a528a3359527c21bbbcc6425b2eebaff69177c3eecb612a1d137b020bd019c WHIRLPOOL 45c6e4ca421df003a9ec19dca500972395644a55cafa1482c8860a87baf3ffa71ef9c4180f07dfe4db3c8b2ac0ca8171233a7e54245622cd9108f5a975ec1b80 -DIST pbr-1.2.0.tar.gz 99092 SHA256 1543fc3e00261369c160fc8cf700717aad15fbc1f0ea0e8dc4f372cb91a655d0 SHA512 e5adc396596f4b42a8eb569c970a3cf571b119740b9ca221dc57c6f34c088df1dbfca3c704b7dd3b2d6676d48f9eba17ddb535e28ef6ab0572206620b894c5a2 WHIRLPOOL 6baaeecc6dc7c228d76f7a8f42af19cf179540483267ea863323e09654a3faac0cabbea6dc6d83b36e0c4496cd5872f05e1e9b7f5c5a36272fc746f84e2dd504 -DIST pbr-1.3.0.tar.gz 99701 SHA256 1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d SHA512 29f661a1d8bed6df5017bb342209e702f19e72c321952a9131d84222162599208bea67922485a87b6f3505e072d62cb13fdfcdd4fbb7c085b3476f6ff5a07df9 WHIRLPOOL 978d943efd2f582b8067a898f102005c749df8addee4ec3d6f4f4c4078e3190263ceba46409281e7bd38ab59ad12f45d3d208cfd6ba58ece72d973161dfd08e9 -DIST pbr-1.6.0.tar.gz 99945 SHA256 4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1 SHA512 a0393cc7774ea3e181ba75c976f5961686afeb214d8c16f3fdd3838154323cd856ded759cae1c6a25b0371c72d95e579b04de0902d56c432ef137f820032c0fd WHIRLPOOL f0a4c4744a86ee1285490ec78fa8e9dc910d926b05746ccf1be5342fe4369bf33a6373ff4fc9981f2547fa83dbc743de4b204a79c9eee8bd4396a983c5509686 -DIST pbr-1.7.0.tar.gz 99850 SHA256 d6e696dbd2b311225e3a21fe11d611989434cb366ff7919cef5ef1add859526e SHA512 333c99132008997b988f93488b1c4d42a30e14ee179866ee4624bdaae3c11ea2bd321d15c86ee435d325dd80fe1de64ff75113c2c8f5f7b31248188c9e3719fe WHIRLPOOL 62effaec7fb99c89dbba36af71208472c4cfb7fbbb2549440f995048b1ff0b0b289
