Hello community,
here is the log from the commit of package python-oslo.i18n for
openSUSE:Factory checked in at 2020-10-26 16:16:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.i18n (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.i18n.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.i18n"
Mon Oct 26 16:16:44 2020 rev:17 rq:841209 version:5.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.i18n/python-oslo.i18n.changes
2020-06-05 20:16:17.230996527 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.i18n.new.3463/python-oslo.i18n.changes
2020-10-26 16:17:24.966988347 +0100
@@ -1,0 +2,21 @@
+Fri Oct 9 19:17:01 UTC 2020 - [email protected]
+
+- update to version 5.0.1
+ - Imported Translations from Zanata
+ - Stop to use the __future__ module.
+ - Update master for stable/ussuri
+ - Remove a couple more shim tests
+ - Add Babel aliases to get_available_languages
+ - Bump bandit version
+ - Switch to newer openstackdocstheme and reno versions
+ - Add Python3 victoria unit tests
+ - Add py38 package metadata
+ - Remove translation sections from setup.cfg
+ - Drop use of babel
+ - Remove the unused coding style modules
+ - Align contributing doc with oslo's policy
+ - Add release notes links to doc index
+ - Bump default tox env from py37 to py38
+ - Remove Message.translate
+
+-------------------------------------------------------------------
Old:
----
oslo.i18n-4.0.1.tar.gz
New:
----
oslo.i18n-5.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.i18n.spec ++++++
--- /var/tmp/diff_new_pack.azSkaz/_old 2020-10-26 16:17:25.810989026 +0100
+++ /var/tmp/diff_new_pack.azSkaz/_new 2020-10-26 16:17:25.814989029 +0100
@@ -17,15 +17,15 @@
Name: python-oslo.i18n
-Version: 4.0.1
+Version: 5.0.1
Release: 0
Summary: OpenStack i18n library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.i18n
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.i18n/oslo.i18n-4.0.1.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python3-Babel >= 2.3.4
+BuildRequires: python3-Babel
BuildRequires: python3-mock
BuildRequires: python3-oslotest
BuildRequires: python3-pbr >= 2.0.0
@@ -41,7 +41,7 @@
%package -n python3-oslo.i18n
Summary: OpenStack i18n library
Group: Development/Languages/Python
-Requires: python3-Babel >= 2.3.4
+Requires: python3-Babel
Requires: python3-six >= 1.10.0
%description -n python3-oslo.i18n
@@ -62,7 +62,7 @@
Documentation for the oslo.i18n library.
%prep
-%autosetup -p1 -n oslo.i18n-4.0.1
+%autosetup -p1 -n oslo.i18n-5.0.1
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.azSkaz/_old 2020-10-26 16:17:25.838989048 +0100
+++ /var/tmp/diff_new_pack.azSkaz/_new 2020-10-26 16:17:25.842989051 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslo.i18n/oslo.i18n.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/oslo.i18n/oslo.i18n.spec.j2</param>
<param name="output-name">python-oslo.i18n.spec</param>
- <param
name="requirements">https://opendev.org/openstack/oslo.i18n/raw/branch/stable/ussuri/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.i18n/raw/branch/stable/victoria/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.i18n</param>
</service>
++++++ oslo.i18n-4.0.1.tar.gz -> oslo.i18n-5.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/.zuul.yaml
new/oslo.i18n-5.0.1/.zuul.yaml
--- old/oslo.i18n-4.0.1/.zuul.yaml 2020-04-07 12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/.zuul.yaml 2020-09-11 21:18:16.000000000 +0200
@@ -4,7 +4,7 @@
- lib-forward-testing-python3
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- - openstack-python3-ussuri-jobs
+ - openstack-python3-victoria-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/AUTHORS new/oslo.i18n-5.0.1/AUTHORS
--- old/oslo.i18n-4.0.1/AUTHORS 2020-04-07 12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/AUTHORS 2020-09-11 21:19:11.000000000 +0200
@@ -46,6 +46,7 @@
Mark McLoughlin <[email protected]>
Mathew Odden <[email protected]>
Matt Odden <[email protected]>
+Moisés Guimarães de Medeiros <[email protected]>
Monty Taylor <[email protected]>
Nikhil Manchanda <[email protected]>
Noorul Islam K M <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/CONTRIBUTING.rst
new/oslo.i18n-5.0.1/CONTRIBUTING.rst
--- old/oslo.i18n-4.0.1/CONTRIBUTING.rst 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/CONTRIBUTING.rst 2020-09-11 21:18:16.000000000
+0200
@@ -1,3 +1,8 @@
+If you would like to contribute to the development of oslo's libraries,
+first you must take a look to this page:
+
+
https://specs.openstack.org/openstack/oslo-specs/specs/policy/contributing.html
+
If you would like to contribute to the development of OpenStack,
you must follow the steps in this page:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/ChangeLog
new/oslo.i18n-5.0.1/ChangeLog
--- old/oslo.i18n-4.0.1/ChangeLog 2020-04-07 12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/ChangeLog 2020-09-11 21:19:11.000000000 +0200
@@ -1,6 +1,30 @@
CHANGES
=======
+5.0.1
+-----
+
+* Bump bandit version
+
+5.0.0
+-----
+
+* Stop to use the \_\_future\_\_ module
+* Remove a couple more shim tests
+* Imported Translations from Zanata
+* Remove Message.translate
+* Add Babel aliases to get\_available\_languages
+* Switch to newer openstackdocstheme and reno versions
+* Remove the unused coding style modules
+* Remove translation sections from setup.cfg
+* Align contributing doc with oslo's policy
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Drop use of babel
+* Add release notes links to doc index
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+
4.0.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/PKG-INFO new/oslo.i18n-5.0.1/PKG-INFO
--- old/oslo.i18n-4.0.1/PKG-INFO 2020-04-07 12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/PKG-INFO 2020-09-11 21:19:11.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.i18n
-Version: 4.0.1
+Version: 5.0.1
Summary: Oslo i18n library
Home-page: https://docs.openstack.org/oslo.i18n/latest
Author: OpenStack
@@ -48,6 +48,7 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/babel.cfg
new/oslo.i18n-5.0.1/babel.cfg
--- old/oslo.i18n-4.0.1/babel.cfg 2020-04-07 12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/babel.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[python: **.py]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/doc/requirements.txt
new/oslo.i18n-5.0.1/doc/requirements.txt
--- old/oslo.i18n-4.0.1/doc/requirements.txt 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/doc/requirements.txt 2020-09-11 21:18:16.000000000
+0200
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-sphinx>=1.8.0,!=2.1.0 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/doc/source/conf.py
new/oslo.i18n-5.0.1/doc/source/conf.py
--- old/oslo.i18n-4.0.1/doc/source/conf.py 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/doc/source/conf.py 2020-09-11 21:18:16.000000000
+0200
@@ -23,10 +23,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.i18n'
-bug_project = 'oslo.i18n'
-bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+openstackdocs_repo_name = 'openstack/oslo.i18n'
+openstackdocs_bug_project = 'oslo.i18n'
+openstackdocs_bug_tag = ''
# The master toctree document.
master_doc = 'index'
@@ -43,7 +42,7 @@
add_module_names = True
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# -- Options for HTML output --------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/doc/source/index.rst
new/oslo.i18n-5.0.1/doc/source/index.rst
--- old/oslo.i18n-4.0.1/doc/source/index.rst 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/doc/source/index.rst 2020-09-11 21:18:16.000000000
+0200
@@ -6,6 +6,9 @@
internationalization (i18n) features, especially translation for text
strings in an application or library.
+Contents
+========
+
.. toctree::
:maxdepth: 2
@@ -13,7 +16,15 @@
reference/index
contributor/index
-.. rubric:: Indices and tables
+Release Notes
+=============
+
+Read also the `oslo.i18n Release Notes
+<https://docs.openstack.org/releasenotes/oslo.i18n/>`_.
+
+
+Indices and tables
+==================
* :ref:`modindex`
* :ref:`search`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/lower-constraints.txt
new/oslo.i18n-5.0.1/lower-constraints.txt
--- old/oslo.i18n-4.0.1/lower-constraints.txt 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/lower-constraints.txt 2020-09-11 21:18:16.000000000
+0200
@@ -1,6 +1,5 @@
alabaster==0.7.10
appdirs==1.3.0
-Babel==2.3.4
bandit==1.4.0
coverage==4.0
debtcollector==1.2.0
@@ -8,39 +7,34 @@
dulwich==0.15.0
extras==1.0.0
fixtures==3.0.0
-flake8==2.5.5
gitdb==0.6.4
GitPython==1.0.1
-hacking==0.12.0
imagesize==0.7.1
iso8601==0.1.11
Jinja2==2.10
keystoneauth1==3.4.0
linecache2==1.0.0
MarkupSafe==1.0
-mccabe==0.2.1
mox3==0.20.0
netaddr==0.7.18
-openstackdocstheme==1.18.1
+openstackdocstheme==2.2.1
os-client-config==1.28.0
oslo.config==5.2.0
oslotest==3.2.0
pbr==2.0.0
-pep8==1.5.7
-pyflakes==0.8.1
Pygments==2.2.0
python-mimeparse==1.6.0
python-subunit==1.0.0
pytz==2013.6
PyYAML==3.12
-reno==2.5.0
+reno==3.1.0
requests==2.14.2
requestsexceptions==1.2.0
rfc3986==0.3.1
six==1.10.0
smmap==0.9.0
snowballstemmer==1.2.1
-Sphinx==1.8.0
+Sphinx==2.0.0
sphinxcontrib-websupport==1.0.1
stestr==2.0.0
stevedore==1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo.i18n.egg-info/PKG-INFO
new/oslo.i18n-5.0.1/oslo.i18n.egg-info/PKG-INFO
--- old/oslo.i18n-4.0.1/oslo.i18n.egg-info/PKG-INFO 2020-04-07
12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo.i18n.egg-info/PKG-INFO 2020-09-11
21:19:11.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.i18n
-Version: 4.0.1
+Version: 5.0.1
Summary: Oslo i18n library
Home-page: https://docs.openstack.org/oslo.i18n/latest
Author: OpenStack
@@ -48,6 +48,7 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo.i18n.egg-info/SOURCES.txt
new/oslo.i18n-5.0.1/oslo.i18n.egg-info/SOURCES.txt
--- old/oslo.i18n-4.0.1/oslo.i18n.egg-info/SOURCES.txt 2020-04-07
12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo.i18n.egg-info/SOURCES.txt 2020-09-11
21:19:11.000000000 +0200
@@ -8,7 +8,6 @@
HACKING.rst
LICENSE
README.rst
-babel.cfg
lower-constraints.txt
requirements.txt
setup.cfg
@@ -77,6 +76,7 @@
releasenotes/source/stein.rst
releasenotes/source/train.rst
releasenotes/source/unreleased.rst
+releasenotes/source/ussuri.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo.i18n.egg-info/pbr.json
new/oslo.i18n-5.0.1/oslo.i18n.egg-info/pbr.json
--- old/oslo.i18n-4.0.1/oslo.i18n.egg-info/pbr.json 2020-04-07
12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo.i18n.egg-info/pbr.json 2020-09-11
21:19:11.000000000 +0200
@@ -1 +1 @@
-{"git_version": "34aaaf2", "is_release": true}
\ No newline at end of file
+{"git_version": "73187bd", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo.i18n.egg-info/requires.txt
new/oslo.i18n-5.0.1/oslo.i18n.egg-info/requires.txt
--- old/oslo.i18n-4.0.1/oslo.i18n.egg-info/requires.txt 2020-04-07
12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo.i18n.egg-info/requires.txt 2020-09-11
21:19:11.000000000 +0200
@@ -1,3 +1,2 @@
pbr!=2.1.0,>=2.0.0
-Babel!=2.4.0,>=2.3.4
six>=1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo_i18n/_gettextutils.py
new/oslo.i18n-5.0.1/oslo_i18n/_gettextutils.py
--- old/oslo.i18n-4.0.1/oslo_i18n/_gettextutils.py 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo_i18n/_gettextutils.py 2020-09-11
21:18:16.000000000 +0200
@@ -19,10 +19,9 @@
import copy
import gettext
+import locale
import os
-from babel import localedata
-
from oslo_i18n import _factory
from oslo_i18n import _locale
@@ -51,6 +50,19 @@
_AVAILABLE_LANGUAGES = {}
+# Copied from Babel so anyone using aliases that were previously provided by
+# the Babel implementation of get_available_languages continues to work. These
+# are not recommended for use in new code.
+_BABEL_ALIASES = {
+ 'ar': 'ar_SY', 'bg': 'bg_BG', 'bs': 'bs_BA', 'ca': 'ca_ES', 'cs': 'cs_CZ',
+ 'da': 'da_DK', 'de': 'de_DE', 'el': 'el_GR', 'en': 'en_US', 'es': 'es_ES',
+ 'et': 'et_EE', 'fa': 'fa_IR', 'fi': 'fi_FI', 'fr': 'fr_FR', 'gl': 'gl_ES',
+ 'he': 'he_IL', 'hu': 'hu_HU', 'id': 'id_ID', 'is': 'is_IS', 'it': 'it_IT',
+ 'ja': 'ja_JP', 'km': 'km_KH', 'ko': 'ko_KR', 'lt': 'lt_LT', 'lv': 'lv_LV',
+ 'mk': 'mk_MK', 'nl': 'nl_NL', 'nn': 'nn_NO', 'no': 'nb_NO', 'pl': 'pl_PL',
+ 'pt': 'pt_PT', 'ro': 'ro_RO', 'ru': 'ru_RU', 'sk': 'sk_SK', 'sl': 'sl_SI',
+ 'sv': 'sv_SE', 'th': 'th_TH', 'tr': 'tr_TR', 'uk': 'uk_UA'
+}
def get_available_languages(domain):
@@ -62,43 +74,23 @@
return copy.copy(_AVAILABLE_LANGUAGES[domain])
localedir = os.environ.get(_locale.get_locale_dir_variable_name(domain))
- find = lambda x: gettext.find(domain,
- localedir=localedir,
- languages=[x])
+
+ def find(x):
+ return gettext.find(domain, localedir=localedir, languages=[x])
# NOTE(mrodden): en_US should always be available (and first in case
# order matters) since our in-line message strings are en_US
language_list = ['en_US']
- locale_identifiers = localedata.locale_identifiers()
- language_list.extend(language for language in locale_identifiers
- if find(language))
-
- # In Babel 1.3, locale_identifiers() doesn't list some OpenStack supported
- # locales (e.g. 'zh_CN', and 'zh_TW') so we add the locales explicitly if
- # necessary so that they are listed as supported.
- aliases = {'zh': 'zh_CN',
- 'zh_Hant_HK': 'zh_HK',
- 'zh_Hant': 'zh_TW',
- 'fil': 'tl_PH'}
- language_list.extend(alias for locale, alias in aliases.items()
- if (locale in language_list and
- alias not in language_list))
-
- language_list.extend(alias for locale, alias in aliases.items()
- if (locale not in language_list and
- find(alias)))
-
- # In webob.acceptparse, the best_match is just match the first element in
- # the language_list, so make the precise element in front
- result = ['en_US']
- for i in language_list[1:]:
- if '_' in i:
- result.insert(1, i)
- else:
- result.append(i)
+ locale_identifiers = set(locale.windows_locale.values())
+ language_list.extend(
+ language for language in locale_identifiers if find(language)
+ )
+ language_list.extend(
+ alias for alias, _ in _BABEL_ALIASES.items() if find(alias)
+ )
- _AVAILABLE_LANGUAGES[domain] = result
- return copy.copy(result)
+ _AVAILABLE_LANGUAGES[domain] = language_list
+ return copy.copy(language_list)
_original_find = gettext.find
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo_i18n/_message.py
new/oslo.i18n-5.0.1/oslo_i18n/_message.py
--- old/oslo.i18n-4.0.1/oslo_i18n/_message.py 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/oslo_i18n/_message.py 2020-09-11 21:18:16.000000000
+0200
@@ -68,41 +68,6 @@
msg.has_plural_form = has_plural_form
return msg
- def translate(self, desired_locale=None):
- """DEPRECATED: Use ``translation`` instead
-
- This is a compatibility shim to allow callers a chance to move away
- from using this function, which shadows a built-in function from our
- parent class.
- """
- # We did a bad thing here. We shadowed the unicode built-in translate,
- # which means there are circumstances where this function may be called
- # with a desired_locale that is a non-string sequence or mapping type.
- # This will not only result in incorrect behavior, it also fails
- # because things like lists are not hashable, and we use the value in
- # desired_locale as part of a dict key. If we see a non-string
- # desired_locale, we know that the caller did not intend to call this
- # form of translate and we should instead pass that along to the
- # unicode implementation of translate.
- #
- # Unfortunately this doesn't entirely solve the problem as it would be
- # possible for a caller to use a string as the mapping type and in that
- # case we can't tell which version of translate they intended to call.
- # That doesn't seem to be a common thing to do though. str.maketrans
- # returns a dict, and that is probably the way most callers will create
- # their mapping.
- if (desired_locale is not None and
- not isinstance(desired_locale, six.string_types)):
- return super(Message, self).translate(desired_locale)
- warnings.warn('Message.translate called with a string argument. '
- 'If your intent was to translate the message into '
- 'another language, please call Message.translation '
- 'instead. If your intent was to call "translate" as '
- 'defined by the str/unicode type, please use a dict or '
- 'list mapping instead. String mappings will not work '
- 'until this compatibility shim is removed.')
- return self.translation(desired_locale)
-
def translation(self, desired_locale=None):
"""Translate this message to the desired locale.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo_i18n/tests/test_gettextutils.py
new/oslo.i18n-5.0.1/oslo_i18n/tests/test_gettextutils.py
--- old/oslo.i18n-4.0.1/oslo_i18n/tests/test_gettextutils.py 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo_i18n/tests/test_gettextutils.py 2020-09-11
21:18:16.000000000 +0200
@@ -18,7 +18,6 @@
import logging
from unittest import mock
-from babel import localedata
from oslotest import base as test_base
import six
@@ -75,29 +74,16 @@
self.assertIn('_', six.moves.builtins.__dict__)
def test_get_available_languages(self):
- # All the available languages for which locale data is available
- def _mock_locale_identifiers():
- # 'zh', 'zh_Hant'. 'zh_Hant_HK', 'fil' all have aliases
- # missing from babel but we add them in _gettextutils, we
- # test that here too
- return ['zh', 'es', 'nl', 'fr', 'zh_Hant', 'zh_Hant_HK', 'fil']
-
- mock_patcher = mock.patch.object(localedata,
- 'list' if hasattr(localedata, 'list')
- else 'locale_identifiers',
- _mock_locale_identifiers)
- mock_patcher.start()
- self.addCleanup(mock_patcher.stop)
-
# Only the languages available for a specific translation domain
def _mock_gettext_find(domain, localedir=None, languages=None, all=0):
languages = languages or []
if domain == 'domain_1':
- return 'translation-file' if any(x in ['zh', 'es', 'fil']
- for x in languages) else None
+ if any(x in ['en_GB', 'es_ES', 'fil_PH', 'it']
+ for x in languages):
+ return 'translation-file'
elif domain == 'domain_2':
- return 'translation-file' if any(x in ['fr', 'zh_Hant']
- for x in languages) else None
+ if any(x in ['fr_FR', 'zh_HK'] for x in languages):
+ return 'translation-file'
return None
mock_patcher = mock.patch.object(gettext, 'find', _mock_gettext_find)
mock_patcher.start()
@@ -110,20 +96,21 @@
# and it should also always be the first element since order matters
domain_1_languages = _gettextutils.get_available_languages('domain_1')
domain_2_languages = _gettextutils.get_available_languages('domain_2')
- self.assertEqual('en_US', domain_1_languages[0])
- self.assertEqual('en_US', domain_2_languages[0])
+
# The domain languages should be included after en_US with
# with their respective aliases when it applies
- self.assertEqual(6, len(domain_1_languages))
- self.assertIn('zh', domain_1_languages)
- self.assertIn('zh_CN', domain_1_languages)
- self.assertIn('es', domain_1_languages)
- self.assertIn('fil', domain_1_languages)
- self.assertIn('tl_PH', domain_1_languages)
- self.assertEqual(4, len(domain_2_languages))
- self.assertIn('fr', domain_2_languages)
- self.assertIn('zh_Hant', domain_2_languages)
- self.assertIn('zh_TW', domain_2_languages)
+ self.assertEqual('en_US', domain_1_languages[0])
+ self.assertEqual('en_US', domain_2_languages[0])
+
+ self.assertEqual(5, len(domain_1_languages), domain_1_languages)
+ self.assertEqual(
+ {'en_US', 'fil_PH', 'en_GB', 'es_ES', 'it'},
+ set(domain_1_languages),
+ )
+ self.assertEqual(3, len(domain_2_languages), domain_2_languages)
+ self.assertEqual({'en_US', 'fr_FR', 'zh_HK'},
+ set(domain_2_languages))
+
self.assertEqual(2, len(_gettextutils._AVAILABLE_LANGUAGES))
# Now test an unknown domain, only en_US should be included
unknown_domain_languages = _gettextutils.get_available_languages('huh')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo_i18n/tests/test_message.py
new/oslo.i18n-5.0.1/oslo_i18n/tests/test_message.py
--- old/oslo.i18n-4.0.1/oslo_i18n/tests/test_message.py 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo_i18n/tests/test_message.py 2020-09-11
21:18:16.000000000 +0200
@@ -14,8 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-from __future__ import unicode_literals
-
import logging
from unittest import mock
import warnings
@@ -616,32 +614,6 @@
self.assertEqual(zh_translation, msg.translation('zh'))
self.assertEqual(fr_translation, msg.translation('fr'))
- # TODO(bnemec): Remove these three tests when the translate compatibility
- # shim is removed.
- def test_translate_with_dict(self):
- msg = _message.Message('abc')
- # This dict is what you get back from str.maketrans('abc', 'xyz')
- # We can't actually call that here because it doesn't exist on py2
- # and the string.maketrans that does behaves differently.
- self.assertEqual('xyz', msg.translate({97: 120, 98: 121, 99: 122}))
-
- def test_translate_with_list(self):
- msg = _message.Message('abc')
- table = [six.unichr(x) for x in range(128)]
- table[ord('a')] = 'b'
- table[ord('b')] = 'c'
- table[ord('c')] = 'd'
- self.assertEqual('bcd', msg.translate(table))
-
- @mock.patch('warnings.warn')
- def test_translate_warning(self, mock_warn):
- msg = _message.Message('a message')
- msg.translate('es')
- self.assertTrue(mock_warn.called, 'No warning found')
- # Make sure it was our warning
- self.assertIn('Message.translate called with a string argument.',
- mock_warn.call_args[0][0])
-
class TranslateMsgidTest(test_base.BaseTestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/oslo_i18n/tests/test_translate.py
new/oslo.i18n-5.0.1/oslo_i18n/tests/test_translate.py
--- old/oslo.i18n-4.0.1/oslo_i18n/tests/test_translate.py 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/oslo_i18n/tests/test_translate.py 2020-09-11
21:18:16.000000000 +0200
@@ -14,8 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-from __future__ import unicode_literals
-
from unittest import mock
from oslotest import base as test_base
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/releasenotes/source/conf.py
new/oslo.i18n-5.0.1/releasenotes/source/conf.py
--- old/oslo.i18n-4.0.1/releasenotes/source/conf.py 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/releasenotes/source/conf.py 2020-09-11
21:18:16.000000000 +0200
@@ -40,10 +40,10 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.i18n'
-bug_project = 'oslo.i18n'
-bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+openstackdocs_repo_name = 'openstack/oslo.i18n'
+openstackdocs_bug_project = 'oslo.i18n'
+openstackdocs_bug_tag = ''
+openstackdocs_auto_name = False
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -98,7 +98,7 @@
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/releasenotes/source/index.rst
new/oslo.i18n-5.0.1/releasenotes/source/index.rst
--- old/oslo.i18n-4.0.1/releasenotes/source/index.rst 2020-04-07
12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/releasenotes/source/index.rst 2020-09-11
21:18:16.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ ussuri
train
stein
rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.i18n-4.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
new/oslo.i18n-5.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
---
old/oslo.i18n-4.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2020-04-07 12:06:30.000000000 +0200
+++
new/oslo.i18n-5.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2020-09-11 21:18:16.000000000 +0200
@@ -1,15 +1,16 @@
# Andi Chandler <[email protected]>, 2017. #zanata
# Andi Chandler <[email protected]>, 2018. #zanata
# Andi Chandler <[email protected]>, 2019. #zanata
+# Andi Chandler <[email protected]>, 2020. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: oslo.i18n\n"
+"Project-Id-Version: oslo.i18n Release Notes\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-06 04:11+0000\n"
+"POT-Creation-Date: 2020-05-26 13:59+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-12-21 02:55+0000\n"
+"PO-Revision-Date: 2020-05-04 09:30+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en_GB\n"
@@ -19,6 +20,9 @@
msgid "3.11.0"
msgstr "3.11.0"
+msgid "4.0.0"
+msgstr "4.0.0"
+
msgid "Introduce reno for deployer release notes."
msgstr "Introduce reno for deployer release notes."
@@ -40,11 +44,24 @@
msgid "Stein Series Release Notes"
msgstr "Stein Series Release Notes"
+msgid ""
+"Support for Python 2.7 has been dropped. The minimum version of Python now "
+"supported is Python 3.6."
+msgstr ""
+"Support for Python 2.7 has been dropped. The minimum version of Python now "
+"supported is Python 3.6."
+
msgid "Train Series Release Notes"
msgstr "Train Series Release Notes"
msgid "Unreleased Release Notes"
msgstr "Unreleased Release Notes"
+msgid "Upgrade Notes"
+msgstr "Upgrade Notes"
+
+msgid "Ussuri Series Release Notes"
+msgstr "Ussuri Series Release Notes"
+
msgid "oslo.i18n Release Notes"
msgstr "oslo.i18n Release Notes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/releasenotes/source/ussuri.rst
new/oslo.i18n-5.0.1/releasenotes/source/ussuri.rst
--- old/oslo.i18n-4.0.1/releasenotes/source/ussuri.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.i18n-5.0.1/releasenotes/source/ussuri.rst 2020-09-11
21:18:16.000000000 +0200
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+ :branch: stable/ussuri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/requirements.txt
new/oslo.i18n-5.0.1/requirements.txt
--- old/oslo.i18n-4.0.1/requirements.txt 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/requirements.txt 2020-09-11 21:18:16.000000000
+0200
@@ -3,5 +3,4 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
six>=1.10.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/setup.cfg
new/oslo.i18n-5.0.1/setup.cfg
--- old/oslo.i18n-4.0.1/setup.cfg 2020-04-07 12:07:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/setup.cfg 2020-09-11 21:19:11.000000000 +0200
@@ -17,6 +17,7 @@
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
@@ -24,20 +25,6 @@
packages =
oslo_i18n
-[compile_catalog]
-directory = oslo_i18n/locale
-domain = oslo_i18n
-
-[update_catalog]
-domain = oslo_i18n
-output_dir = oslo_i18n/locale
-input_file = oslo_i18n/locale/oslo_i18n.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext _C:1c,2 _P:1,2
-mapping_file = babel.cfg
-output_file = oslo_i18n/locale/oslo_i18n.pot
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/test-requirements.txt
new/oslo.i18n-5.0.1/test-requirements.txt
--- old/oslo.i18n-4.0.1/test-requirements.txt 2020-04-07 12:06:30.000000000
+0200
+++ new/oslo.i18n-5.0.1/test-requirements.txt 2020-09-11 21:18:16.000000000
+0200
@@ -12,4 +12,4 @@
oslo.config>=5.2.0 # Apache-2.0
# Bandit security code scanner
-bandit>=1.1.0,<1.6.0 # Apache-2.0
+bandit>=1.6.0,<1.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.i18n-4.0.1/tox.ini new/oslo.i18n-5.0.1/tox.ini
--- old/oslo.i18n-4.0.1/tox.ini 2020-04-07 12:06:30.000000000 +0200
+++ new/oslo.i18n-5.0.1/tox.ini 2020-09-11 21:18:16.000000000 +0200
@@ -1,6 +1,6 @@
[tox]
minversion = 3.1.1
-envlist = py37,pep8
+envlist = py38,pep8
ignore_basepython_conflict = true
[testenv]
