From 830c76e3bb18c25bb0c389a9708044647986cb5d Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: May 16 2019 16:56:34 +0000 Subject: Update to Stein release --- diff --git a/.gitignore b/.gitignore index c4cb21a..ccd77ed 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /oslo.concurrency-3.18.0.tar.gz /oslo.concurrency-3.25.0.tar.gz /oslo.concurrency-3.25.1.tar.gz +/oslo.concurrency-3.29.1.tar.gz diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec index 91921c0..3231aac 100644 --- a/python-oslo-concurrency.spec +++ b/python-oslo-concurrency.spec @@ -1,3 +1,4 @@ + %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 @@ -13,8 +14,8 @@ external processes. Tests for the Oslo concurrency library. Name: python-oslo-concurrency -Version: 3.25.1 -Release: 2%{?dist} +Version: 3.29.1 +Release: 1%{?dist} Summary: OpenStack Oslo concurrency library License: ASL 2.0 @@ -29,7 +30,7 @@ BuildArch: noarch %package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo concurrency library - +Group: Documentation BuildRequires: python3-sphinx BuildRequires: python3-openstackdocstheme @@ -49,14 +50,13 @@ BuildRequires: python3-hacking BuildRequires: python3-oslotest BuildRequires: python3-fixtures BuildRequires: python3-eventlet +BuildRequires: python3-fasteners BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-i18n BuildRequires: python3-oslo-utils -BuildRequires: python3-fasteners - Requires: python3-pbr -Requires: python3-fixtures -Requires: python3-oslo-config >= 2:5.1.0 +Requires: python3-oslo-config >= 2:5.2.0 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-oslo-utils >= 3.33.0 Requires: python3-six @@ -98,7 +98,7 @@ rm -rf {test-,}requirements.txt %if 0%{?with_doc} # generate html docs %{__python3} setup.py build_sphinx -b html -# remove the sphinx-build leftovers +# remove the sphinx-build-3 leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif @@ -110,15 +110,19 @@ ln -s ./lockutils-wrapper-%{python3_version} %{buildroot}%{_bindir}/lockutils-wr # Install i18n .mo files (.po and .pot are not required) install -d -m 755 %{buildroot}%{_datadir} + rm -f %{buildroot}%{python3_sitelib}/oslo_concurrency/locale/*/LC_*/oslo_concurrency*po rm -f %{buildroot}%{python3_sitelib}/oslo_concurrency/locale/*pot mv %{buildroot}%{python3_sitelib}/oslo_concurrency/locale %{buildroot}%{_datadir}/locale +rm -rf %{buildroot}%{python3_sitelib}/oslo_concurrency/locale # Find language files %find_lang oslo_concurrency --all-name %check -PYTHON=%{__python3} %{__python3} setup.py test +export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 +rm -rf .testrepository +%{__python3} setup.py test %if 0%{?with_doc} %files -n python-%{pkg_name}-doc @@ -144,12 +148,6 @@ PYTHON=%{__python3} %{__python3} setup.py test %changelog -* Fri Feb 01 2019 Alfredo Moralejo 3.25.1-2 -- Remove python2 subpackages. - -* Fri May 11 2018 RDO 3.25.1-1 -- Update to 3.25.1 - -* Sat Feb 10 2018 RDO 3.25.0-1 -- Update to 3.25.0 +* Fri Mar 08 2019 RDO 3.29.1-1 +- Update to 3.29.1 diff --git a/sources b/sources index e4da4bd..4880f0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.concurrency-3.25.1.tar.gz) = 5c306e742c652d66209a3218ccdc1d1f957ec6fde0b0bcb9411a71e470e8c0402c4cc1a40a05094ce591942ed16b8e0a7b456d60a64e0299ef32a257b37c8388 +SHA512 (oslo.concurrency-3.29.1.tar.gz) = f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e