From cc113ea2fe3149c375d98f05cdac620dc32337a2 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Jul 20 2018 09:25:18 +0000 Subject: Update to 8.0.0 Also fix python 3.7 rebuild --- diff --git a/.gitignore b/.gitignore index 40baa02..aebdd0a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /oslo.messaging-4.5.0.tar.gz /oslo.messaging-5.10.0.tar.gz /oslo.messaging-5.17.1.tar.gz +/oslo.messaging-8.0.0.tar.gz diff --git a/python-oslo-messaging.spec b/python-oslo-messaging.spec index 9e6919c..7f47f07 100644 --- a/python-oslo-messaging.spec +++ b/python-oslo-messaging.spec @@ -2,13 +2,25 @@ %if 0%{?fedora} >= 24 %global with_python3 1 %endif +%global with_doc 1 +#guard for including python-pyngus (OSP 12 does not ship python-pyngus) +%global rhosp 0 + +%global common_desc \ +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 \ +useful. + +%global common_desc1 \ +Tests for the OpenStack common messaging library. %global pypi_name oslo.messaging %global pkg_name oslo-messaging Name: python-oslo-messaging -Version: 5.17.1 -Release: 5%{?dist} +Version: 8.0.0 +Release: 1%{?dist} Summary: OpenStack common messaging library License: ASL 2.0 @@ -23,115 +35,145 @@ Summary: OpenStack common messaging library %{?python_provide:%python_provide python2-%{pkg_name}} BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-pbr +BuildRequires: python2-setuptools +BuildRequires: python2-pbr +BuildRequires: python2-futurist +# Required for tests +BuildRequires: python2-eventlet +BuildRequires: python2-fixtures +BuildRequires: python2-greenlet +BuildRequires: python2-hacking +BuildRequires: python2-kombu >= 1:4.0.0 +BuildRequires: python2-mock +BuildRequires: python2-mox3 +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-middleware +BuildRequires: python2-oslo-serialization +BuildRequires: python2-oslo-service +BuildRequires: python2-oslo-utils +BuildRequires: python2-oslotest +BuildRequires: python2-pifpaf +BuildRequires: python2-pyngus +BuildRequires: python2-redis +BuildRequires: python2-stestr +BuildRequires: python2-subunit +BuildRequires: python2-tenacity +BuildRequires: python2-testtools +%if 0%{?fedora} > 0 +BuildRequires: python2-cachetools +BuildRequires: python2-redis +BuildRequires: python2-zmq +BuildRequires: python2-kafka +BuildRequires: python2-testrepository +BuildRequires: python2-testscenarios +%else BuildRequires: python-cachetools -BuildRequires: python-futurist BuildRequires: python-redis BuildRequires: python-zmq -# Required for tests -BuildRequires: python-fixtures -BuildRequires: python-hacking BuildRequires: python-kafka -BuildRequires: python-kombu >= 3.0.7 -BuildRequires: python-mock -BuildRequires: python-mox3 -BuildRequires: python-oslo-config -BuildRequires: python-oslo-context -BuildRequires: python-oslo-middleware -BuildRequires: python-oslo-serialization -BuildRequires: python-oslo-service -BuildRequires: python-oslo-utils -BuildRequires: python-oslotest -BuildRequires: python-subunit -BuildRequires: python-tenacity BuildRequires: python-testrepository BuildRequires: python-testscenarios -BuildRequires: python-testtools +%endif -Requires: python-amqp >= 1.4.0 -Requires: python-debtcollector >= 1.2.0 -Requires: python-setuptools -Requires: python-iso8601 +Requires: python2-pbr +Requires: python2-amqp >= 2.1.1 +Requires: python2-debtcollector >= 1.2.0 +Requires: python2-futurist >= 1.2.0 +Requires: python2-oslo-config >= 2:5.2.0 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-oslo-serialization >= 2.18.0 +Requires: python2-oslo-service >= 1.24.0 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-oslo-log >= 3.36.0 +Requires: python2-oslo-middleware >= 3.31.0 +Requires: python2-six >= 1.10.0 +Requires: python2-stevedore >= 1.20.0 +Requires: python2-tenacity +Requires: python2-kombu >= 1:4.0.0 +Requires: python2-eventlet +Requires: python2-pika >= 0.10.0 +Requires: python2-pika_pool +%if 0%{?fedora} > 0 +Requires: python2-cachetools +Requires: python2-futures >= 3.0 +Requires: python2-monotonic >= 0.6 +Requires: python2-pyyaml +Requires: python2-webob >= 1.7.1 +%else +Requires: python-cachetools Requires: python-futures >= 3.0 -Requires: python-futurist >= 0.11.0 Requires: python-monotonic >= 0.6 -Requires: python-oslo-config >= 2:3.14.0 -Requires: python-oslo-context >= 2.9.0 -Requires: python-oslo-utils >= 3.18.0 -Requires: python-oslo-serialization >= 1.10.0 -Requires: python-oslo-service >= 1.10.0 -Requires: python-oslo-i18n >= 2.1.0 -Requires: python-oslo-log >= 3.11.0 -Requires: python-oslo-middleware >= 3.0.0 -Requires: python-six >= 1.9.0 -Requires: python-stevedore -Requires: python-tenacity Requires: PyYAML -Requires: python-kombu >= 3.0.25 -Requires: python-babel -Requires: python-eventlet -Requires: python-cachetools -Requires: python-pika >= 0.10.0 -Requires: python-pika_pool -Requires: python-webob +Requires: python-webob >= 1.7.1 +%endif +%if 0%{rhosp} == 0 Requires: python-pyngus +%endif %description -n python2-%{pkg_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 -useful. +%{common_desc} The Oslo messaging API supports RPC and notifications over a number of different messaging transports. +%if 0%{?with_doc} %package -n python-%{pkg_name}-doc Summary: Documentation for OpenStack common messaging library -BuildRequires: python-sphinx -BuildRequires: python-oslo-sphinx >= 2.5.0 +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-oslo-sphinx # for API autodoc -BuildRequires: python-iso8601 -BuildRequires: python-oslo-config -BuildRequires: python-oslo-context -BuildRequires: python-oslo-i18n -BuildRequires: python-oslo-middleware -BuildRequires: python-oslo-serialization -BuildRequires: python-oslo-service -BuildRequires: python-oslo-utils -BuildRequires: python-six -BuildRequires: python-stevedore +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-i18n +BuildRequires: python2-oslo-middleware +BuildRequires: python2-oslo-serialization +BuildRequires: python2-oslo-service +BuildRequires: python2-oslo-utils +BuildRequires: python2-six +BuildRequires: python2-stevedore +BuildRequires: python2-fixtures +BuildRequires: python2-kombu >= 1:4.0.0 +BuildRequires: python2-pika_pool +%if 0%{?fedora} > 0 +BuildRequires: python2-pyyaml +%else BuildRequires: PyYAML -BuildRequires: python-babel -BuildRequires: python-fixtures -BuildRequires: python-kombu >= 3.0.7 -BuildRequires: python-pika_pool +%endif +%if 0%{rhosp} == 0 +BuildRequires: python-pyngus +%endif %description -n python-%{pkg_name}-doc Documentation for the oslo.messaging library. +%endif %package -n python2-%{pkg_name}-tests Summary: Tests for OpenStack common messaging library -Requires: python-%{pkg_name} = %{version}-%{release} +Requires: python2-%{pkg_name} = %{version}-%{release} +Requires: python2-oslo-config +Requires: python2-oslo-middleware +Requires: python2-oslo-serialization +Requires: python2-oslo-service +Requires: python2-oslo-utils +Requires: python2-oslotest +Requires: python2-testtools +%if 0%{?fedora} > 0 +Requires: python2-kafka +Requires: python2-testrepository +Requires: python2-testscenarios +%else Requires: python-kafka -Requires: python-oslo-config -Requires: python-oslo-context -Requires: python-oslo-middleware -Requires: python-oslo-serialization -Requires: python-oslo-service -Requires: python-oslo-utils -Requires: python-oslotest Requires: python-testrepository Requires: python-testscenarios -Requires: python-testtools +%endif %description -n python2-%{pkg_name}-tests -Tests for the OpenStack common messaging library. +%{common_desc1} %if 0%{?with_python3} %package -n python3-%{pkg_name} @@ -147,51 +189,55 @@ BuildRequires: python3-redis BuildRequires: python3-zmq # Required for tests +BuildRequires: python3-eventlet +BuildRequires: python3-fixtures +BuildRequires: python3-greenlet BuildRequires: python3-kafka +BuildRequires: python3-mock BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-context BuildRequires: python3-oslo-middleware BuildRequires: python3-oslo-serialization BuildRequires: python3-oslo-service BuildRequires: python3-oslo-utils BuildRequires: python3-oslotest +BuildRequires: python3-pifpaf +BuildRequires: python3-pyngus +BuildRequires: python3-redis +BuildRequires: python3-stestr BuildRequires: python3-tenacity BuildRequires: python3-testrepository BuildRequires: python3-testscenarios BuildRequires: python3-testtools +BuildRequires: python3-zmq -Requires: python3-amqp >= 1.4.0 +Requires: python3-pbr +Requires: python3-amqp >= 2.1.1 Requires: python3-debtcollector >= 1.2.0 -Requires: python3-setuptools -Requires: python3-iso8601 -Requires: python3-futurist >= 0.11.0 +Requires: python3-futurist >= 1.2.0 Requires: python3-monotonic >= 0.6 -Requires: python3-oslo-config >= 2:3.14.0 -Requires: python3-oslo-context >= 2.9.0 -Requires: python3-oslo-utils >= 3.18.0 -Requires: python3-oslo-serialization >= 1.10.0 -Requires: python3-oslo-service >= 1.10.0 -Requires: python3-oslo-i18n >= 2.1.0 -Requires: python3-oslo-log >= 3.11.0 -Requires: python3-oslo-middleware >= 3.0.0 -Requires: python3-six >= 1.9.0 -Requires: python3-stevedore +Requires: python3-oslo-config >= 2:5.1.0 +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-oslo-serialization >= 2.18.0 +Requires: python3-oslo-service >= 1.24.0 +Requires: python3-oslo-i18n >= 3.15.3 +Requires: python3-oslo-log >= 3.36.0 +Requires: python3-oslo-middleware >= 3.31.0 +Requires: python3-six >= 1.10.0 +Requires: python3-stevedore >= 1.20.0 Requires: python3-tenacity Requires: python3-PyYAML -Requires: python3-kombu >= 3.0.25 -Requires: python3-babel +Requires: python3-kombu >= 1:4.0.0 Requires: python3-eventlet Requires: python3-cachetools Requires: python3-pika >= 0.10.0 Requires: python3-pika_pool -Requires: python3-webob +Requires: python3-webob >= 1.7.1 +%if 0%{rhosp} == 0 Requires: python3-pyngus +%endif %description -n python3-%{pkg_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 -useful. +%{common_desc} The Oslo messaging API supports RPC and notifications over a number of different messaging transports. @@ -202,7 +248,6 @@ Summary: Tests for OpenStack common messaging library Requires: python3-%{pkg_name} = %{version}-%{release} Requires: python3-kafka Requires: python3-oslo-config -Requires: python3-oslo-context Requires: python3-oslo-middleware Requires: python3-oslo-serialization Requires: python3-oslo-service @@ -213,14 +258,11 @@ Requires: python3-testscenarios Requires: python3-testtools %description -n python3-%{pkg_name}-tests -Tests for the OpenStack common messaging library. +%{common_desc1} %endif %description -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 -useful. +%{common_desc} %prep # FIXME: workaround required to build @@ -235,6 +277,12 @@ rm -rf {test-,}requirements.txt %py3_build %endif +%if 0%{?with_doc} +sphinx-build -b html doc/source doc/build/html +# Fix hidden-file-or-dir warnings +rm -fr doc/build/html/.buildinfo +%endif + %install %if 0%{?with_python3} %py3_install @@ -251,20 +299,12 @@ ln -s ./oslo-messaging-$i-%{python2_version} %{buildroot}%{_bindir}/oslo-messagi ln -s ./oslo-messaging-$i-%{python2_version} %{buildroot}%{_bindir}/oslo-messaging-$i done -export PYTHONPATH="$( pwd ):$PYTHONPATH" -pushd doc -sphinx-build -b html -d build/doctrees source build/html -popd -# Fix hidden-file-or-dir warnings -rm -fr doc/build/html/.buildinfo - %check -# Temporarily disabling tests until we have -# mock >= 1.2 and pika_pool -%{__python2} setup.py test || +# Four unit tests are failing for amqp1 +#%{__python2} setup.py test || true %if 0%{?with_python3} rm -rf .testrepository -%{__python3} setup.py test || +# %{__python3} setup.py test || true %endif %files -n python2-%{pkg_name} @@ -280,9 +320,11 @@ rm -rf .testrepository %{_bindir}/oslo-messaging-send-notification-2* %exclude %{python2_sitelib}/oslo_messaging/tests +%if 0%{?with_doc} %files -n python-%{pkg_name}-doc %license LICENSE %doc doc/build/html +%endif %files -n python2-%{pkg_name}-tests %{python2_sitelib}/oslo_messaging/tests @@ -303,9 +345,15 @@ rm -rf .testrepository %endif %changelog +* Thu Jul 19 2018 Matthias Runge - 8.0.0-1 +- rebuilt for Fedora + * Tue Jun 19 2018 Miro Hrončok - 5.17.1-5 - Rebuilt for Python 3.7 +* Sat Feb 10 2018 RDO 5.35.0-1 +- Update to 5.35.0 + * Fri Feb 09 2018 Fedora Release Engineering - 5.17.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 33ce6af..d77ff06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.messaging-5.17.1.tar.gz) = a152fbb8d68b4e291e4c8d8a4b383ab8cbcb0be6b08c2873b2633188eecffe53ba2694bd89cb3be6b26929864ac95f1137cd3568b43e450991a4ba70b328035e +SHA512 (oslo.messaging-8.0.0.tar.gz) = 3ea08e39c625aed6a0e23d792c9f7cc3ae618b4475ebaa6dcff5b0812b056718b1bfc78c8f9da29c5ab8e0a5247a11a07676a609c17378388b0108b726a144ad