* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/
@ 2024-06-12 5:58 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-06-12 5:58 UTC (permalink / raw
To: gentoo-commits
commit: f4d57558f7662efb03f1bbbea58c18f73b6e0005
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 05:51:16 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 05:58:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d57558
dev-python/oslo-config: Enable py3.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/oslo-config-9.4.0-py313.patch | 42 ++++++++++++++++++++++
dev-python/oslo-config/oslo-config-9.4.0.ebuild | 7 +++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
new file mode 100644
index 000000000000..b3e6979f9e4f
--- /dev/null
+++ b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
@@ -0,0 +1,42 @@
+From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 12 Jun 2024 07:47:18 +0200
+Subject: [PATCH] Fix tests for Python 3.13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix expected argparse --help output to account for changes in Python
+3.13.
+
+Closes-Bug: 2069108
+Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_config/tests/test_cfg.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
+index 926eb8c..f69f7a0 100644
+--- a/oslo_config/tests/test_cfg.py
++++ b/oslo_config/tests/test_cfg.py
+@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase):
+ self.conf.register_cli_opt(uvw)
+ self.conf([])
+ self.conf.print_help(file=f)
+- self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue())
+- self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue())
++ if sys.version_info >= (3, 13):
++ self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue())
++ self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue())
++ else:
++ self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC',
++ f.getvalue())
++ self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW',
++ f.getvalue())
+
+
+ class FindConfigFilesTestCase(BaseTestCase):
+--
+2.45.2
+
diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
index 8a5bbb36170a..69c20f0f2f3d 100644
--- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1 pypi
@@ -46,6 +46,11 @@ BDEPEND="
distutils_enable_tests unittest
src_prepare() {
+ local PATCHES=(
+ # https://review.opendev.org/c/openstack/oslo.log/+/921797
+ "${FILESDIR}/${P}-py313.patch"
+ )
+
# broken by some dep upgrade
sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
oslo_config/tests/test_cfg.py || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/
@ 2024-07-20 13:27 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-07-20 13:27 UTC (permalink / raw
To: gentoo-commits
commit: be020011e63c3b8b7d0d237f5e8c6048671c8c18
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 12:28:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 13:27:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be020011
dev-python/oslo-config: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/oslo-config/Manifest | 1 -
.../files/oslo-config-9.4.0-py313.patch | 42 ---------------
dev-python/oslo-config/oslo-config-9.4.0.ebuild | 63 ----------------------
3 files changed, 106 deletions(-)
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 8416938cc0eb..16dd266ea64e 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo.config-9.4.0.tar.gz 161322 BLAKE2B 3edd3be09ebe777ebcb4cd79171bae764046f6ceb0f0c9ca8f88388f1a0bcd23d2bb4e4130ab81a7f3cf063ce0ee668ffbcd8c4bf9f633213e97dcd12e2575dd SHA512 d404876c34c82963af8b992091fd1186855b3ced9a6a574ca4fc152a5b50bfc1945aca04e163770d8bec948cb57904a83eae9e3d7c4c3b852c90987f73e66ba9
DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f
diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
deleted file mode 100644
index b3e6979f9e4f..000000000000
--- a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 12 Jun 2024 07:47:18 +0200
-Subject: [PATCH] Fix tests for Python 3.13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix expected argparse --help output to account for changes in Python
-3.13.
-
-Closes-Bug: 2069108
-Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_config/tests/test_cfg.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
-index 926eb8c..f69f7a0 100644
---- a/oslo_config/tests/test_cfg.py
-+++ b/oslo_config/tests/test_cfg.py
-@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase):
- self.conf.register_cli_opt(uvw)
- self.conf([])
- self.conf.print_help(file=f)
-- self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue())
-- self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue())
-+ if sys.version_info >= (3, 13):
-+ self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue())
-+ self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue())
-+ else:
-+ self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC',
-+ f.getvalue())
-+ self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW',
-+ f.getvalue())
-
-
- class FindConfigFilesTestCase(BaseTestCase):
---
-2.45.2
-
diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
deleted file mode 100644
index 69c20f0f2f3d..000000000000
--- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
- https://opendev.org/openstack/oslo.config/
- https://github.com/openstack/oslo.config/
- https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
- test? (
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- local PATCHES=(
- # https://review.opendev.org/c/openstack/oslo.log/+/921797
- "${FILESDIR}/${P}-py313.patch"
- )
-
- # broken by some dep upgrade
- sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
- oslo_config/tests/test_cfg.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local -x COLUMNS=80
- eunittest -b
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/
@ 2024-08-27 14:37 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-08-27 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 50f930e36f48cd7458e16b1f1cce376468e8d272
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 14:30:40 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 14:37:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f930e3
dev-python/oslo-config: Bump to 9.6.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/oslo-config/Manifest | 1 +
.../files/oslo-config-9.6.0-py312.patch | 43 +++++++++++++++
dev-python/oslo-config/oslo-config-9.6.0.ebuild | 63 ++++++++++++++++++++++
3 files changed, 107 insertions(+)
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 16dd266ea64e..ddaed0ef51d9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1 +1,2 @@
DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f
+DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
diff --git a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
new file mode 100644
index 000000000000..f105b7719199
--- /dev/null
+++ b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
@@ -0,0 +1,43 @@
+From 972d304bb23baef538ce759004410a20d8109ccb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 27 Aug 2024 15:54:45 +0200
+Subject: [PATCH] Fix test_sub_command_multiple on Python 3.12.5+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Update the expectations in test_sub_command_multiple for different
+argparse error handling in Python 3.12.5 and newer. Previously,
+the 'cannot have multiple subparser arguments' error would be output
+to stderr and cause the parser to exit; now it raises an ArgumentError
+instead.
+
+Closes-Bug: 2074130
+Change-Id: I83de6b6943b14f1f6df86a55603e6867dce680d3
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_config/tests/test_cfg.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
+index 1759ae7..383b70f 100644
+--- a/oslo_config/tests/test_cfg.py
++++ b/oslo_config/tests/test_cfg.py
+@@ -4385,8 +4385,12 @@ class SubCommandTestCase(BaseTestCase):
+ self.conf.register_cli_opt(cfg.SubCommandOpt('cmd1'))
+ self.conf.register_cli_opt(cfg.SubCommandOpt('cmd2'))
+ self.useFixture(fixtures.MonkeyPatch('sys.stderr', io.StringIO()))
+- self.assertRaises(SystemExit, self.conf, [])
+- self.assertIn('multiple', sys.stderr.getvalue())
++ if sys.version_info >= (3, 12, 5):
++ self.assertRaisesRegex(argparse.ArgumentError, 'multiple',
++ self.conf, [])
++ else:
++ self.assertRaises(SystemExit, self.conf, [])
++ self.assertIn('multiple', sys.stderr.getvalue())
+
+
+ class SetDefaultsTestCase(BaseTestCase):
+--
+2.46.0
+
diff --git a/dev-python/oslo-config/oslo-config-9.6.0.ebuild b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
new file mode 100644
index 000000000000..764961e742d4
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="
+ https://opendev.org/openstack/oslo.config/
+ https://github.com/openstack/oslo.config/
+ https://pypi.org/project/oslo.config/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ local PATCHES=(
+ # https://review.opendev.org/c/openstack/oslo.config/+/927273
+ "${FILESDIR}/${P}-py312.patch"
+ )
+
+ # broken by some dep upgrade
+ sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
+ oslo_config/tests/test_cfg.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x COLUMNS=80
+ eunittest -b
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/
@ 2025-01-04 17:28 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2025-01-04 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 121bcbd52788fae9e311aea6bf57a6c8876330e2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 17:25:59 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 17:28:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121bcbd5
dev-python/oslo-config: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/oslo-config/Manifest | 1 -
.../files/oslo-config-9.6.0-py312.patch | 43 ---------------
dev-python/oslo-config/oslo-config-9.6.0.ebuild | 63 ----------------------
3 files changed, 107 deletions(-)
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 5a412bff44c1..401a8cef47a9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
DIST oslo.config-9.7.0.tar.gz 164544 BLAKE2B 25e8ff7697878447a9b6e22802322378eadc0e0a519b5bc61daf4913c818189c6a5ccc100b9920e862cc102a7a8250566466cfc09968e9f58abe5caccc84b8e8 SHA512 573376d1fe0ea8ba2a0e3d681eb89524746da4287795b2373591be55cad0bd6bec59e593a61d9e6df27bded47207261d18855acddc81d4b1cc5cad27e4eaec82
diff --git a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
deleted file mode 100644
index f105b7719199..000000000000
--- a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 972d304bb23baef538ce759004410a20d8109ccb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 27 Aug 2024 15:54:45 +0200
-Subject: [PATCH] Fix test_sub_command_multiple on Python 3.12.5+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update the expectations in test_sub_command_multiple for different
-argparse error handling in Python 3.12.5 and newer. Previously,
-the 'cannot have multiple subparser arguments' error would be output
-to stderr and cause the parser to exit; now it raises an ArgumentError
-instead.
-
-Closes-Bug: 2074130
-Change-Id: I83de6b6943b14f1f6df86a55603e6867dce680d3
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_config/tests/test_cfg.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
-index 1759ae7..383b70f 100644
---- a/oslo_config/tests/test_cfg.py
-+++ b/oslo_config/tests/test_cfg.py
-@@ -4385,8 +4385,12 @@ class SubCommandTestCase(BaseTestCase):
- self.conf.register_cli_opt(cfg.SubCommandOpt('cmd1'))
- self.conf.register_cli_opt(cfg.SubCommandOpt('cmd2'))
- self.useFixture(fixtures.MonkeyPatch('sys.stderr', io.StringIO()))
-- self.assertRaises(SystemExit, self.conf, [])
-- self.assertIn('multiple', sys.stderr.getvalue())
-+ if sys.version_info >= (3, 12, 5):
-+ self.assertRaisesRegex(argparse.ArgumentError, 'multiple',
-+ self.conf, [])
-+ else:
-+ self.assertRaises(SystemExit, self.conf, [])
-+ self.assertIn('multiple', sys.stderr.getvalue())
-
-
- class SetDefaultsTestCase(BaseTestCase):
---
-2.46.0
-
diff --git a/dev-python/oslo-config/oslo-config-9.6.0.ebuild b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
deleted file mode 100644
index 08a6668af8c9..000000000000
--- a/dev-python/oslo-config/oslo-config-9.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
- https://opendev.org/openstack/oslo.config/
- https://github.com/openstack/oslo.config/
- https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
- test? (
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- local PATCHES=(
- # https://review.opendev.org/c/openstack/oslo.config/+/927273
- "${FILESDIR}/${P}-py312.patch"
- )
-
- # broken by some dep upgrade
- sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
- oslo_config/tests/test_cfg.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local -x COLUMNS=80
- eunittest -b
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-04 17:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-04 17:28 [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-08-27 14:37 Michał Górny
2024-07-20 13:27 Michał Górny
2024-06-12 5:58 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox