From 3a08fb27d4c0bd97eaf001d1e242e86536ff80b7 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Apr 15 2016 18:05:58 +0000 Subject: Update to 1.6.0 --- diff --git a/.gitignore b/.gitignore index 5d3fe62..40ea6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /oslo.reports-0.5.0.tar.gz /oslo.reports-0.6.0.tar.gz +/oslo.reports-1.6.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..f4ad487 --- /dev/null +++ b/Changelog.old @@ -0,0 +1,15 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 23 2015 Parag Nemade - 0.6.0-3 +- python3 test failed, workaround found in some launchpad bug +- Try Adding few missing BuildRequires: for python3 subpackage + +* Tue Nov 10 2015 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Oct 13 2015 Lukas Bezdicka - 0.6.0-1 +- Update to 0.6.0 + +* Tue Sep 15 2015 Lukas Bezdicka - 0.5.0-1 +- Initial packaging diff --git a/python-oslo-reports.spec b/python-oslo-reports.spec index 75778a1..1095a78 100644 --- a/python-oslo-reports.spec +++ b/python-oslo-reports.spec @@ -1,19 +1,21 @@ %global pypi_name oslo.reports +%global pkg_name oslo-reports -%if 0%{?fedora} +%if 0%{?fedora} >= 24 %global with_python3 1 %endif %{!?upstream_version: %global upstream_version %{version}%{?milestone}} -Name: python-oslo-reports -Version: 0.6.0 -Release: 4%{?dist} +Name: python-%{pkg_name} +Version: 1.6.0 +Release: 1%{?dist} Summary: Openstack common reports library License: ASL 2.0 URL: http://launchpad.net/oslo -Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz + BuildArch: noarch %description @@ -24,21 +26,22 @@ useful. OpenStack library for creating Guru Meditation Reports and other reports. -%package -n python2-oslo-reports -Summary: Openstack common reports library -%{?python_provide:%python_provide python2-oslo-reports} +%package -n python2-%{pkg_name} +Summary: OpenStack common reports library +%{?python_provide:%python_provide python2-%{pkg_name}} BuildRequires: python2-devel BuildRequires: python-pbr -BuildRequires: python-sphinx +# test requirements +BuildRequires: python-hacking +BuildRequires: python-oslotest BuildRequires: python-oslo-config -BuildRequires: python-oslo-i18n +BuildRequires: python-eventlet +BuildRequires: python-greenlet +BuildRequires: python-coverage +BuildRequires: python-oslo-utils BuildRequires: python-oslo-serialization BuildRequires: python-psutil -BuildRequires: python-greenlet -BuildRequires: python-mock -BuildRequires: python-fixtures -BuildRequires: python-oslotest Requires: python-jinja2 Requires: python-babel @@ -48,7 +51,7 @@ Requires: python-oslo-utils >= 2.0.0 Requires: python-psutil Requires: python-six >= 1.9.0 -%description -n python2-oslo-reports +%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 @@ -56,31 +59,47 @@ useful. OpenStack library for creating Guru Meditation Reports and other reports. -%package -n python2-oslo-reports-doc -Summary: Documentation for OpenStack common messaging library +%package -n python-%{pkg_name}-doc +Summary: Documentation for OpenStack common reports library BuildRequires: python-sphinx -BuildRequires: python-oslo-sphinx +BuildRequires: python-oslo-sphinx >= 2.5.0 + -%description -n python2-oslo-reports-doc -Documentation for the oslo.messaging library. +%description -n python-%{pkg_name}-doc +Documentation for the oslo.reports library. + +%package -n python-%{pkg_name}-tests +Summary: Test module for OpenStack common reports library + +Requires: python-%{pkg_name} = %{version}-%{release} +Requires: python-hacking +Requires: python-oslotest +Requires: python-oslo-config +Requires: python-eventlet +Requires: python-greenlet +Requires: python-coverage + +%description -n python-%{pkg_name}-tests +Test module for OpenStack common reports library %if 0%{?with_python3} -%package -n python3-oslo-reports -Summary: Openstack common reports library -%{?python_provide:%python_provide python3-oslo-reports} +%package -n python3-%{pkg_name} +Summary: OpenStack oslo.reports library +%{?python_provide:%python_provide python3-%{pkg_name}} BuildRequires: python3-devel BuildRequires: python3-pbr -BuildRequires: python3-sphinx +# test requirements +BuildRequires: python3-hacking +BuildRequires: python3-oslotest BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-i18n +BuildRequires: python3-eventlet +BuildRequires: python3-greenlet +BuildRequires: python3-coverage +BuildRequires: python3-oslo-utils BuildRequires: python3-oslo-serialization BuildRequires: python3-psutil -BuildRequires: python3-greenlet -BuildRequires: python3-mock -BuildRequires: python3-fixtures -BuildRequires: python3-oslotest Requires: python3-jinja2 Requires: python3-babel @@ -90,7 +109,7 @@ Requires: python3-oslo-utils >= 2.0.0 Requires: python3-psutil Requires: python3-six >= 1.9.0 -%description -n python3-oslo-reports +%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 @@ -102,68 +121,59 @@ OpenStack library for creating Guru Meditation Reports and other reports. %prep %setup -q -n %{pypi_name}-%{upstream_version} -# let RPM handle deps -rm -rf {test-,}requirements.txt +# Let RPM handle the dependencies +rm -f requirements.txt %build -%{__python2} setup.py build -%if 0%{?with_python3} -%{__python3} setup.py build -%endif +%py2_build # generate html docs sphinx-build doc/source html # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} +%if 0%{?with_python3} +%py3_build +%endif + %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%py2_install + %if 0%{?with_python3} -%{__python3} setup.py install --skip-build --root %{buildroot} +%py3_install %endif %check %{__python2} setup.py test - -# Got to know about this ugly hack from -# https://bugs.launchpad.net/testrepository/+bug/1229445 -rm .testrepository/times.dbm - %if 0%{?with_python3} +rm -rf .testrepository %{__python3} setup.py test %endif -%files -n python2-oslo-reports +%files -n python2-%{pkg_name} %license LICENSE %doc README.rst %{python2_sitelib}/oslo_reports %{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/oslo_reports/tests %if 0%{?with_python3} -%files -n python3-oslo-reports +%files -n python3-%{pkg_name} %license LICENSE %doc README.rst %{python3_sitelib}/oslo_reports %{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/oslo_reports/tests %endif -%files -n python2-oslo-reports-doc +%files -n python-%{pkg_name}-doc %license LICENSE %doc html -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Nov 23 2015 Parag Nemade - 0.6.0-3 -- python3 test failed, workaround found in some launchpad bug -- Try Adding few missing BuildRequires: for python3 subpackage - -* Tue Nov 10 2015 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 +%files -n python-%{pkg_name}-tests +%{python2_sitelib}/oslo_reports/tests -* Tue Oct 13 2015 Lukas Bezdicka - 0.6.0-1 -- Update to 0.6.0 +%changelog +* Wed Mar 23 2016 Haikel Guemar 1.6.0- +- Update to 1.6.0 -* Tue Sep 15 2015 Lukas Bezdicka - 0.5.0-1 -- Initial packaging diff --git a/sources b/sources index 5812646..d1987df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1822407344596dcc72e5faa83b15033 oslo.reports-0.6.0.tar.gz +e47b333cad4684848585b658bcf35370 oslo.reports-1.6.0.tar.gz