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?= <[email protected]> +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 <[email protected]> +--- + 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
