From efd56308d3df7699e9583f2b93c8e222bcb8dda7 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Apr 15 2016 16:57:08 +0000 Subject: Update to 2.2.0 --- diff --git a/.gitignore b/.gitignore index ebef2e3..eebfe8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /oslo.context-0.4.0.tar.gz /oslo.context-0.5.0.tar.gz /oslo.context-0.6.0.tar.gz +/oslo.context-2.2.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..ff21a38 --- /dev/null +++ b/Changelog.old @@ -0,0 +1,45 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Sep 18 2015 Alan Pevec 0.6.0-1 +- Update to upstream 0.6.0 + +* Tue Sep 08 2015 Haïkel Guémar - 0.5.0-4 +- Fix provides and drop workarounds + +* Mon Sep 07 2015 Chandan Kumar 0.5.0-3 +- fix obseletes +- fix package namespaces + +* Thu Sep 03 2015 Chandan Kumar 0.5.0-2 +- Added python2 and python3 subpackages + +* Mon Aug 17 2015 Alan Pevec 0.5.0-1 +- Update to upstream 0.5.0 + +* Mon Jun 29 2015 Alan Pevec 0.4.0-1 +- Update to upstream 0.4.0 + +* Thu Jun 18 2015 Fedora Release Engineering - 0.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Mar 27 2015 Chandan Kumar - 0.2.0-5 +- Fixed Doc issue and added missing dependencies + +* Wed Mar 25 2015 Chandan Kumar - 0.2.0-4 +- Fixed docs + +* Tue Mar 24 2015 Chandan Kumar - 0.2.0-3 +- Fixes typo in spec file + +* Tue Mar 24 2015 Chandan Kumar - 0.2.0-2 +- Added docs + +* Thu Mar 12 2015 Chandan Kumar - 0.2.0-1 +- Updated the spec file for oslo-context 0.2.0 release + +* Sat Dec 20 2014 Dan Prince -XXX +- Initial package. diff --git a/python-oslo-context.spec b/python-oslo-context.spec index 018086c..3cd52e1 100644 --- a/python-oslo-context.spec +++ b/python-oslo-context.spec @@ -1,16 +1,15 @@ %global pypi_name oslo.context -%global pname oslo-context -%{!?_licensedir:%global license %%doc} +%global pkg_name oslo-context -%if 0%{?fedora} +%if 0%{?fedora} >= 24 %global with_python3 1 %endif %{!?upstream_version: %global upstream_version %{version}%{?milestone}} -Name: python-oslo-context -Version: 0.6.0 -Release: 3%{?dist} +Name: python-%{pkg_name} +Version: 2.2.0 +Release: 1%{?dist} Summary: OpenStack Oslo Context library License: ASL 2.0 @@ -19,72 +18,82 @@ Source0: https://pypi.python.org/packages/source/o/%{pypi_name}/%{pypi_na BuildArch: noarch -%description -The OpenStack Oslo context library has helpers to maintain -useful information about a request context. -The request context is usually populated in the -WSGI pipeline and used by various modules such as logging. - -%package -n python2-oslo-context +%package -n python2-%{pkg_name} Summary: OpenStack Oslo Context library -%{?python_provide:%python_provide python2-%{pname}} +%{?python_provide:%python_provide python2-%{pkg_name}} BuildRequires: python2-devel BuildRequires: python-pbr +# test dependencies +BuildRequires: python-hacking +BuildRequires: python-oslotest +BuildRequires: python-coverage + Requires: python-babel +Requires: python-pbr -%description -n python2-oslo-context +%description -n python2-%{pkg_name} The OpenStack Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging. -%package -n python2-oslo-context-doc -Summary: Documentation for the OpenStack Oslo context library -%{?python_provide:%python_provide python2-%{pname}-doc} +%package -n python-%{pkg_name}-tests +Summary: Tests for OpenStack Oslo context library + +Requires: python-%{pkg_name} = %{version}-%{release} + +%description -n python-%{pkg_name}-tests +Tests for OpenStack Oslo context library + +%package -n python-%{pkg_name}-doc +Summary: Documentation for the OpenStack Oslo context library BuildRequires: python-sphinx BuildRequires: python-oslo-sphinx BuildRequires: python-fixtures -%description -n python2-oslo-context-doc - +%description -n python-%{pkg_name}-doc Documentation for the OpenStack Oslo context library. # python3 %if 0%{?with_python3} -%package -n python3-oslo-context +%package -n python3-%{pkg_name} Summary: OpenStack Oslo Context library -%{?python_provide:%python_provide python3-%{pname}} +%{?python_provide:%python_provide python3-%{pkg_name}} BuildRequires: python3-devel BuildRequires: python3-pbr +# test dependencies +BuildRequires: python3-hacking +BuildRequires: python3-oslotest +BuildRequires: python3-coverage + Requires: python3-babel +Requires: python3-pbr -%description -n python3-oslo-context +%description -n python3-%{pkg_name} The OpenStack Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging. -%package -n python3-oslo-context-doc -Summary: Documentation for the OpenStack Oslo context library -%{?python_provide:%python_provide python3-%{pname}} -BuildRequires: python3-sphinx -BuildRequires: python3-oslo-sphinx -BuildRequires: python3-fixtures - -%description -n python3-oslo-context-doc -Documentation for the OpenStack Oslo context library. %endif +%description +The OpenStack Oslo context library has helpers to maintain +useful information about a request context. +The request context is usually populated in the +WSGI pipeline and used by various modules such as logging. + %prep -%setup -q -n %{pypi_name}-%{version} +%setup -q -n %{pypi_name}-%{upstream_version} rm -f requirements.txt %build -%{__python2} setup.py build +%py2_build + # doc export PYTHONPATH="$( pwd ):$PYTHONPATH" %{__python2} setup.py build_sphinx @@ -92,90 +101,48 @@ export PYTHONPATH="$( pwd ):$PYTHONPATH" rm -fr doc/build/html/.{doctrees,buildinfo} %if 0%{?with_python3} -%{__python3} setup.py build -export PYTHONPATH="$( pwd ):$PYTHONPATH" -pushd doc -sphinx-build-3 -b html -d build/doctrees source build/html -popd -# Fix hidden-file-or-dir warnings -rm -fr doc/build/html/.buildinfo +%py3_build %endif %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%py2_install +%if 0%{?with_python3} +%py3_install +%endif +%check +%{__python2} setup.py test %if 0%{?with_python3} -%{__python3} setup.py install --skip-build --root %{buildroot} +rm -rf .testrepository +%{__python3} setup.py test %endif -%files -n python2-oslo-context + +%files -n python2-%{pkg_name} %license LICENSE %doc README.rst %{python2_sitelib}/oslo_context %{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/oslo_context/tests %if 0%{?with_python3} -%files -n python3-oslo-context +%files -n python3-%{pkg_name} %license LICENSE %doc README.rst %{python3_sitelib}/oslo_context %{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/oslo_context/tests %endif -%files -n python2-oslo-context-doc +%files -n python-%{pkg_name}-doc %license LICENSE %doc doc/build/html -%if 0%{?with_python3} -%files -n python3-oslo-context-doc +%files -n python-%{pkg_name}-tests %license LICENSE -%doc doc/build/html -%endif - +%{python2_sitelib}/oslo_context/tests %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Sep 18 2015 Alan Pevec 0.6.0-1 -- Update to upstream 0.6.0 - -* Tue Sep 08 2015 Haïkel Guémar - 0.5.0-4 -- Fix provides and drop workarounds - -* Mon Sep 07 2015 Chandan Kumar 0.5.0-3 -- fix obseletes -- fix package namespaces - -* Thu Sep 03 2015 Chandan Kumar 0.5.0-2 -- Added python2 and python3 subpackages - -* Mon Aug 17 2015 Alan Pevec 0.5.0-1 -- Update to upstream 0.5.0 - -* Mon Jun 29 2015 Alan Pevec 0.4.0-1 -- Update to upstream 0.4.0 - -* Thu Jun 18 2015 Fedora Release Engineering - 0.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 27 2015 Chandan Kumar - 0.2.0-5 -- Fixed Doc issue and added missing dependencies - -* Wed Mar 25 2015 Chandan Kumar - 0.2.0-4 -- Fixed docs - -* Tue Mar 24 2015 Chandan Kumar - 0.2.0-3 -- Fixes typo in spec file - -* Tue Mar 24 2015 Chandan Kumar - 0.2.0-2 -- Added docs - -* Thu Mar 12 2015 Chandan Kumar - 0.2.0-1 -- Updated the spec file for oslo-context 0.2.0 release +* Wed Mar 23 2016 Haikel Guemar 2.2.0- +- Update to 2.2.0 -* Sat Dec 20 2014 Dan Prince -XXX -- Initial package. diff --git a/sources b/sources index 05855dc..ce727d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ea7be4a795443cfd0a20ad30e5f7fee oslo.context-0.6.0.tar.gz +a80bac86e1f946b05b9bc9c5f785e6b8 oslo.context-2.2.0.tar.gz