diff --git a/.gitignore b/.gitignore index c2b84aa..fa02133 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /oslo.config-5.2.0.tar.gz /oslo.config-6.8.1.tar.gz /oslo.config-6.11.1.tar.gz +/oslo.config-8.0.2.tar.gz diff --git a/python-oslo-config.spec b/python-oslo-config.spec index d3d60d8..55b0da3 100644 --- a/python-oslo-config.spec +++ b/python-oslo-config.spec @@ -1,26 +1,14 @@ -# Macros for py2/py3 compatibility -%if 0%{?fedora} || 0%{?rhel} > 7 -%global pyver %{python3_pkgversion} -%else -%global pyver 2 -%endif -%global pyver_bin python%{pyver} -%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}} -%global pyver_install %{expand:%{py%{pyver}_install}} -%global pyver_build %{expand:%{py%{pyver}_build}} -# End of macros for py2/py3 compatibility %global sname oslo.config %global pypi_name oslo-config %global with_doc 1 -# Needed for train bootstrap %global repo_bootstrap 1 %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: python-oslo-config Epoch: 2 -Version: 6.11.1 -Release: 4%{?dist} +Version: 8.0.2 +Release: 1%{?dist} Summary: OpenStack common configuration library Group: Development/Languages @@ -41,54 +29,41 @@ useful. The oslo-config library is a command line and configuration file parsing library from the Oslo project. -%package -n python%{pyver}-%{pypi_name} +%package -n python3-%{pypi_name} Summary: OpenStack common configuration library -%{?python_provide:%python_provide python%{pyver}-%{pypi_name}} -%if %{pyver} == 3 +%{?python_provide:%python_provide python3-%{pypi_name}} Obsoletes: python2-%{pypi_name} < %{version}-%{release} -%endif - -Requires: python%{pyver}-oslo-i18n >= 3.15.3 -Requires: python%{pyver}-rfc3986 >= 1.2.0 -Requires: python%{pyver}-pbr -Requires: python%{pyver}-requests >= 2.18.0 -Requires: python%{pyver}-six >= 1.10.0 -Requires: python%{pyver}-stevedore >= 1.20.0 -Requires: python%{pyver}-debtcollector >= 1.2.0 -Requires: python%{pyver}-netaddr >= 0.7.18 -%if %{pyver} == 2 -Requires: python-enum34 -Requires: PyYAML >= 3.10 -%else -Requires: python%{pyver}-PyYAML >= 3.10 -%endif -BuildRequires: python%{pyver}-devel -BuildRequires: python%{pyver}-setuptools -BuildRequires: python%{pyver}-oslo-i18n -BuildRequires: python%{pyver}-rfc3986 -BuildRequires: python%{pyver}-pbr +Requires: python3-oslo-i18n >= 3.15.3 +Requires: python3-rfc3986 >= 1.2.0 +Requires: python3-pbr +Requires: python3-requests >= 2.18.0 +Requires: python3-stevedore >= 1.20.0 +Requires: python3-debtcollector >= 1.2.0 +Requires: python3-netaddr >= 0.7.18 +Requires: python3-PyYAML >= 3.10 + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-oslo-i18n +BuildRequires: python3-rfc3986 +BuildRequires: python3-pbr BuildRequires: git # Required for tests -BuildRequires: python%{pyver}-testscenarios -BuildRequires: python%{pyver}-stestr -BuildRequires: python%{pyver}-testtools -BuildRequires: python%{pyver}-oslotest -BuildRequires: python%{pyver}-requests-mock -BuildRequires: python%{pyver}-netaddr -BuildRequires: python%{pyver}-stevedore -%if %{pyver} == 2 -BuildRequires: python-enum34 -BuildRequires: PyYAML -%else -BuildRequires: python%{pyver}-PyYAML -%endif +BuildRequires: python3-testscenarios +BuildRequires: python3-stestr +BuildRequires: python3-testtools +BuildRequires: python3-oslotest +BuildRequires: python3-requests-mock +BuildRequires: python3-netaddr +BuildRequires: python3-stevedore +BuildRequires: python3-PyYAML %if 0%{?repo_bootstrap} == 0 -BuildRequires: python%{pyver}-oslo-log +BuildRequires: python3-oslo-log %endif -%description -n python%{pyver}-%{pypi_name} +%description -n python3-%{pypi_name} The Oslo project intends to produce a python library containing infrastructure code shared by OpenStack projects. The APIs provided by the project should be high quality, stable, consistent and generally @@ -101,12 +76,13 @@ parsing library from the Oslo project. %package -n python-%{pypi_name}-doc Summary: Documentation for OpenStack common configuration library -BuildRequires: python%{pyver}-sphinx -BuildRequires: python%{pyver}-fixtures -BuildRequires: python%{pyver}-openstackdocstheme -BuildRequires: python%{pyver}-oslotest >= 1.10.0 -BuildRequires: python%{pyver}-stevedore -BuildRequires: python%{pyver}-sphinxcontrib-apidoc +BuildRequires: python3-sphinx +BuildRequires: python3-fixtures +BuildRequires: python3-openstackdocstheme +BuildRequires: python3-oslotest >= 1.10.0 +BuildRequires: python3-debtcollector +BuildRequires: python3-stevedore +BuildRequires: python3-sphinxcontrib-apidoc %description -n python-%{pypi_name}-doc Documentation for the oslo-config library. @@ -126,38 +102,38 @@ rm oslo_config/tests/test_sphinxconfiggen.py %endif %build -%{pyver_build} +%{py3_build} %if 0%{?with_doc} export PYTHONPATH=. -sphinx-build-%{pyver} -b html doc/source doc/build/html -# remove the sphinx-build-%{pyver} leftovers +sphinx-build-3 -b html doc/source doc/build/html +# remove the sphinx-build-3 leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif %install -%{pyver_install} +%{py3_install} pushd %{buildroot}/%{_bindir} for i in generator validator do -ln -s oslo-config-$i oslo-config-$i-%{pyver} +ln -s oslo-config-$i oslo-config-$i-3 done popd %check %if 0%{?repo_bootstrap} == 0 -PYTHON=%{pyver_bin} stestr-%{pyver} run +PYTHON=python3 stestr-3 run %endif -%files -n python%{pyver}-%{pypi_name} +%files -n python3-%{pypi_name} %doc README.rst %license LICENSE %{_bindir}/oslo-config-generator -%{_bindir}/oslo-config-generator-%{pyver} +%{_bindir}/oslo-config-generator-3 %{_bindir}/oslo-config-validator -%{_bindir}/oslo-config-validator-%{pyver} -%{pyver_sitelib}/oslo_config -%{pyver_sitelib}/*.egg-info +%{_bindir}/oslo-config-validator-3 +%{python3_sitelib}/oslo_config +%{python3_sitelib}/*.egg-info %if 0%{?with_doc} %files -n python-%{pypi_name}-doc @@ -166,6 +142,9 @@ PYTHON=%{pyver_bin} stestr-%{pyver} run %endif %changelog +* Wed Jun 03 2020 Joel Capitao 2:8.0.2-1 +- Update to upstream version 8.0.2 + * Tue May 26 2020 Miro Hrončok - 2:6.11.1-4 - Rebuilt for Python 3.9 diff --git a/sources b/sources index c86e59c..24f70dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.config-6.11.1.tar.gz) = 3cadae6c0b2409e18d9c0a72e0c5bbacc22963a7e1804c09c78126e63f49876f0b15d4f2ea16e5f8a38079b2b2fd1b8760b1de217cbc66d93017aa9db169f23c +SHA512 (oslo.config-8.0.2.tar.gz) = 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5