* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-i18n/, dev-python/oslo-i18n/files/
@ 2024-03-09 14:19 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-03-09 14:19 UTC (permalink / raw
To: gentoo-commits
commit: d4bf2ecd4a3abbfc5dc959bcab63e2a97dd026f1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 14:12:55 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 14:19:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bf2ecd
dev-python/oslo-i18n: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/oslo-i18n/Manifest | 1 -
.../oslo-i18n/files/oslo-i18n-6.2.0-test.patch | 34 ------------------
dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild | 40 ----------------------
3 files changed, 75 deletions(-)
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 05eef74bcfa2..2d67e2ff6f68 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,2 +1 @@
-DIST oslo.i18n-6.2.0.tar.gz 48228 BLAKE2B bb65caff703e2bbc82f4fecd4b0d491f64ec7d863f848f8f79497df9471257dec25a77ad7f084c6d88ac14a4b1a1f44fd302297e1e13919e69ebaf27c5491d6f SHA512 725d814c7db35250e8ffe06c0021fc9147bcdaa300791f1d50b0eef2897abe609b415a12b6aa58d50925516fd9e6a1ad54e141f77e11856de3ab765b4e06939b
DIST oslo.i18n-6.3.0.tar.gz 48207 BLAKE2B 20a882516dd45da8dda34127ba422a619decd982f01adeee5909b8646d49c8609ecb6adad4fc48ab32e820c4dcf4a42d4baf7e776983daf4586ae944b738bb6e SHA512 483ff39425b3fc5c6c54a3502a78a53406ccb3cdb7aff0836b9c2a49b8146fd931e2b4f3133d708d33d16bd99155f8cbcf8505491d74de5016da5e647a069a15
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
deleted file mode 100644
index 6c3c19be0644..000000000000
--- a/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 151fa09cf0248b2dfc8bb9e960e0383583985781 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Nov 2023 09:16:21 +0100
-Subject: [PATCH] Fix leftover `locale.getdefaultlocale` mock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Replace the remaining `locale.getdefaultlocale` mock with
-`locale.getlocale`. 77a994a99385d33b1b2e626094cbd09fd0d85873 has
-replaced the `locale.getdefaultlocale()` call and updated all other
-mocks but this one remained, causing test failures on non-en_US locales.
-
-Closes-Bug: 2043539
-Change-Id: I5ab36a0ead05fa7a83fc1c64e440482f2cc8e675
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_i18n/fixture.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/oslo_i18n/fixture.py b/oslo_i18n/fixture.py
-index 5c5fddc..7a69aff 100644
---- a/oslo_i18n/fixture.py
-+++ b/oslo_i18n/fixture.py
-@@ -160,5 +160,5 @@ class PrefixLazyTranslation(fixtures.Fixture):
- lambda *x, **y: self.languages))
- self.useFixture(fixtures.MonkeyPatch('gettext.translation',
- _prefix_translations))
-- self.useFixture(fixtures.MonkeyPatch('locale.getdefaultlocale',
-+ self.useFixture(fixtures.MonkeyPatch('locale.getlocale',
- lambda *x, **y: self.locale))
---
-2.42.1
-
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
deleted file mode 100644
index 489d749bb8bc..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="
- https://opendev.org/openstack/oslo.i18n/
- https://github.com/openstack/oslo.i18n/
- https://pypi.org/project/oslo.i18n/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-PATCHES=(
- # https://review.opendev.org/c/openstack/oslo.i18n/+/901002
- "${FILESDIR}/${P}-test.patch"
-)
-
-RDEPEND="
- >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- ${RDEPEND}
- test? (
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests unittest
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-i18n/, dev-python/oslo-i18n/files/
@ 2023-11-15 8:23 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-11-15 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 092c2383f221620534eb948f7f81596d6b8d4a86
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 08:21:49 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 08:23:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092c2383
dev-python/oslo-i18n: Bump to 6.2.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/oslo-i18n/Manifest | 1 +
.../oslo-i18n/files/oslo-i18n-6.2.0-test.patch | 34 ++++++++++++++++++
dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild | 40 ++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 34105b1d5a5f..9bb1bb7392eb 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1 +1,2 @@
DIST oslo.i18n-6.1.0.tar.gz 48031 BLAKE2B da2a03eb382154be31dfc09636395cc5f1c816972e81829181b7745b5f35693069fbe68b6b6223d9188d08a0e1ba277a137290810da9aebf3af49a9b4f2069ea SHA512 6ac6a4c7ea5e43d57c04765f0b0ae90047042ead81c086aa3229d8ffe5402a836e82238f6689d6f6d1a503d8abf147605dc1aab8b8bb4d738e575fb7948fd7e3
+DIST oslo.i18n-6.2.0.tar.gz 48228 BLAKE2B bb65caff703e2bbc82f4fecd4b0d491f64ec7d863f848f8f79497df9471257dec25a77ad7f084c6d88ac14a4b1a1f44fd302297e1e13919e69ebaf27c5491d6f SHA512 725d814c7db35250e8ffe06c0021fc9147bcdaa300791f1d50b0eef2897abe609b415a12b6aa58d50925516fd9e6a1ad54e141f77e11856de3ab765b4e06939b
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
new file mode 100644
index 000000000000..6c3c19be0644
--- /dev/null
+++ b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
@@ -0,0 +1,34 @@
+From 151fa09cf0248b2dfc8bb9e960e0383583985781 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Nov 2023 09:16:21 +0100
+Subject: [PATCH] Fix leftover `locale.getdefaultlocale` mock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace the remaining `locale.getdefaultlocale` mock with
+`locale.getlocale`. 77a994a99385d33b1b2e626094cbd09fd0d85873 has
+replaced the `locale.getdefaultlocale()` call and updated all other
+mocks but this one remained, causing test failures on non-en_US locales.
+
+Closes-Bug: 2043539
+Change-Id: I5ab36a0ead05fa7a83fc1c64e440482f2cc8e675
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_i18n/fixture.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/oslo_i18n/fixture.py b/oslo_i18n/fixture.py
+index 5c5fddc..7a69aff 100644
+--- a/oslo_i18n/fixture.py
++++ b/oslo_i18n/fixture.py
+@@ -160,5 +160,5 @@ class PrefixLazyTranslation(fixtures.Fixture):
+ lambda *x, **y: self.languages))
+ self.useFixture(fixtures.MonkeyPatch('gettext.translation',
+ _prefix_translations))
+- self.useFixture(fixtures.MonkeyPatch('locale.getdefaultlocale',
++ self.useFixture(fixtures.MonkeyPatch('locale.getlocale',
+ lambda *x, **y: self.locale))
+--
+2.42.1
+
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
new file mode 100644
index 000000000000..dfb65f41a2d8
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="
+ https://opendev.org/openstack/oslo.i18n/
+ https://github.com/openstack/oslo.i18n/
+ https://pypi.org/project/oslo.i18n/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+ # https://review.opendev.org/c/openstack/oslo.i18n/+/901002
+ "${FILESDIR}/${P}-test.patch"
+)
+
+RDEPEND="
+ >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-i18n/, dev-python/oslo-i18n/files/
@ 2022-07-15 12:13 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2022-07-15 12:13 UTC (permalink / raw
To: gentoo-commits
commit: d66618100ede704ce4371fbe1fd031723869e022
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 12:12:03 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 12:13:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6661810
dev-python/oslo-i18n: enable py3.11
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../files/oslo-i18n-5.1.0-fix-py3.11.patch | 22 ++++++++++++++++++++++
.../files/oslo-i18n-5.1.0-fix-py3.11.patch.bck | 14 ++++++++++++++
dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild | 6 +++++-
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch
new file mode 100644
index 000000000000..488dac1dedc6
--- /dev/null
+++ b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch
@@ -0,0 +1,22 @@
+diff --git a/oslo_i18n/tests/test_message.py b/oslo_i18n/tests/test_message.py
+index 85dbd67..16492bb 100644
+--- a/oslo_i18n/tests/test_message.py
++++ b/oslo_i18n/tests/test_message.py
+@@ -386,7 +386,7 @@ class MessageTestCase(test_base.BaseTestCase):
+
+ self.assertEqual(default_translation, msg.translation('es'))
+
+- self.assertEqual(1, len(w))
++ self.assertLessEqual(1, len(w))
+ # Note(gibi): in python 3.4 str.__repr__ does not put the unicode
+ # marker 'u' in front of the string representations so the test
+ # removes that to have the same result in python 2.7 and 3.4
+@@ -394,7 +394,7 @@ class MessageTestCase(test_base.BaseTestCase):
+ "translated message A message in Spanish: %s %s "
+ "(Original: 'A message: %s'): "
+ "not enough arguments for format string",
+- str(w[0].message).replace("u'", "'"))
++ str(w[-1].message).replace("u'", "'"))
+
+ mock_log.debug.assert_called_with(('Failed to insert replacement '
+ 'values into translated message '
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck
new file mode 100644
index 000000000000..2faae7eb88af
--- /dev/null
+++ b/dev-python/oslo-i18n/files/oslo-i18n-5.1.0-fix-py3.11.patch.bck
@@ -0,0 +1,14 @@
+On python 3.11, we have some more warnings (deprecation warnings),
+so the count is >=1
+
+--- a/oslo_i18n/tests/test_message.py
++++ b/oslo_i18n/tests/test_message.py
+@@ -386,7 +386,7 @@ class MessageTestCase(test_base.BaseTestCase):
+
+ self.assertEqual(default_translation, msg.translation('es'))
+
+- self.assertEqual(1, len(w))
++ self.assertLessEqual(1, len(w))
+ # Note(gibi): in python 3.4 str.__repr__ does not put the unicode
+ # marker 'u' in front of the string representations so the test
+ # removes that to have the same result in python 2.7 and 3.4
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
index 7053c73f76d7..0dd4662cf5a3 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
@@ -24,6 +24,10 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.1.0-fix-py3.11.patch"
+)
+
RDEPEND="
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-09 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-09 14:19 [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-i18n/, dev-python/oslo-i18n/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-11-15 8:23 Michał Górny
2022-07-15 12:13 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox