From a229517c797779de4d6ab0eadb4d600ebe552c37 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Oct 09 2017 16:06:38 +0000 Subject: sync with OpenStack Pike release --- diff --git a/.gitignore b/.gitignore index 982129a..e1b93b8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cliff-2.2.0.tar.gz /cliff-2.3.0.tar.gz /cliff-2.6.0.tar.gz +/cliff-2.8.0.tar.gz diff --git a/python-cliff.spec b/python-cliff.spec index b692869..587993b 100644 --- a/python-cliff.spec +++ b/python-cliff.spec @@ -1,20 +1,19 @@ +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %if 0%{?fedora} %global with_python3 1 %endif %global modname cliff -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -Name: python-cliff -Version: 2.6.0 -Release: 2%{?dist} +Name: python-%{modname} +Version: 2.8.0 +Release: 1%{?dist} Summary: Command Line Interface Formulation Framework Group: Development/Libraries License: ASL 2.0 -URL: http://pypi.python.org/pypi/cliff -Source0: http://pypi.python.org/packages/source/c/cliff/cliff-%{version}.tar.gz +URL: https://pypi.io/pypi/cliff +Source0: https://pypi.io/packages/source/c/cliff/cliff-%{version}.tar.gz BuildArch: noarch @@ -24,22 +23,12 @@ BuildRequires: python-pbr BuildRequires: python-prettytable BuildRequires: python-cmd2 >= 0.6.7 BuildRequires: python-stevedore -BuildRequires: python-six >= 1.9.0 +BuildRequires: python-six -# Required for the test suite -BuildRequires: python-nose -BuildRequires: python-mock -BuildRequires: bash -BuildRequires: bash-completion -BuildRequires: python-unicodecsv -BuildRequires: PyYAML -BuildRequires: python2-docutils - -Requires: python-setuptools Requires: python-prettytable Requires: python-cmd2 >= 0.6.7 -Requires: python-stevedore >= 1.5.0 -Requires: python-six >= 1.9.0 +Requires: python-stevedore >= 1.20.0 +Requires: python-six Requires: python-unicodecsv Requires: PyYAML @@ -48,21 +37,6 @@ BuildRequires: python-argparse Requires: python-argparse %endif - -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-prettytable -BuildRequires: python3-cmd2 >= 0.6.7 -BuildRequires: python3-stevedore -BuildRequires: python3-six -BuildRequires: python3-nose -BuildRequires: python3-mock -BuildRequires: python3-PyYAML -BuildRequires: python3-docutils -%endif - %description cliff is a framework for building command line programs. It uses setuptools entry points to provide subcommands, output formatters, and other @@ -71,15 +45,52 @@ extensions. Documentation for cliff is hosted on readthedocs.org at http://readthedocs.org/docs/cliff/en/latest/ +%package -n python-%{modname}-tests +Summary: Command Line Interface Formulation Framework +# Required for the test suite +BuildRequires: python-mock +BuildRequires: bash +BuildRequires: python-unicodecsv +BuildRequires: PyYAML +BuildRequires: which +BuildRequires: python-docutils +BuildRequires: python-subunit +BuildRequires: python-testrepository +BuildRequires: python-testscenarios +BuildRequires: python-testtools + +Requires: python-%{modname} = %{version}-%{release} +Requires: python-mock +Requires: bash +Requires: python-unicodecsv +Requires: PyYAML +Requires: which +Requires: python-subunit +Requires: python-testrepository +Requires: python-testscenarios +Requires: python-testtools + +%description -n python-%{modname}-tests +This package contains tests for the python cliff library. + %if 0%{?with_python3} %package -n python3-cliff Summary: Command Line Interface Formulation Framework Group: Development/Libraries -Requires: python3-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr +BuildRequires: python3-prettytable +BuildRequires: python3-cmd2 >= 0.6.7 +BuildRequires: python3-stevedore +BuildRequires: python3-six +BuildRequires: python3-PyYAML +BuildRequires: python3-testtools + Requires: python3-prettytable Requires: python3-cmd2 >= 0.6.7 -Requires: python3-stevedore +Requires: python3-stevedore >= 1.20.0 Requires: python3-six Requires: python3-PyYAML @@ -90,13 +101,39 @@ extensions. Documentation for cliff is hosted on readthedocs.org at http://readthedocs.org/docs/cliff/en/latest/ + +%package -n python3-%{modname}-tests +Summary: Command Line Interface Formulation Framework +# Required for the test suite +BuildRequires: bash +BuildRequires: python3-unicodecsv +BuildRequires: python3-PyYAML +BuildRequires: which +BuildRequires: python3-subunit +BuildRequires: python3-testrepository +BuildRequires: python3-testscenarios +BuildRequires: python3-testtools + +Requires: python3-%{modname} = %{version}-%{release} +Requires: bash +Requires: python3-unicodecsv +Requires: python3-PyYAML +Requires: which +Requires: python3-subunit +Requires: python3-testrepository +Requires: python3-testscenarios +Requires: python3-testtools + +%description -n python3-%{modname}-tests +This package contains tests for the python cliff library. %endif %prep -%autosetup -n %{modname}-%{upstream_version} +%setup -q -n %{modname}-%{upstream_version} +rm -rf {test-,}requirements.txt -# let RPM handle deps -rm -f requirements.txt +# Remove bundled egg info +rm -rf *.egg-info %if 0%{?with_python3} rm -rf %{py3dir} @@ -104,7 +141,7 @@ cp -a . %{py3dir} %endif %build -%{__python} setup.py build +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} @@ -119,24 +156,24 @@ pushd %{py3dir} popd %endif -%{__python} setup.py install -O1 --skip-build --root=%{buildroot} +%{__python2} setup.py install -O1 --skip-build --root=%{buildroot} %check -PYTHONPATH=. nosetests -v - %if 0%{?with_python3} -pushd %{py3dir} -sed -i 's/nosetests/nosetests-%{python3_version}/' cliff/tests/test_help.py -PYTHONPATH=. nosetests-%{python3_version} -v -popd +%{__python3} setup.py test +rm -rf .testrepository %endif - +%{__python2} setup.py test %files %license LICENSE %doc doc/ README.rst ChangeLog AUTHORS CONTRIBUTING.rst -%{python_sitelib}/%{modname} -%{python_sitelib}/%{modname}-*.egg-info +%{python2_sitelib}/%{modname} +%{python2_sitelib}/%{modname}-*.egg-info +%exclude %{python2_sitelib}/%{modname}/tests + +%files -n python-%{modname}-tests +%{python2_sitelib}/%{modname}/tests %if 0%{?with_python3} %files -n python3-%{modname} @@ -144,123 +181,13 @@ popd %doc doc/ README.rst ChangeLog AUTHORS CONTRIBUTING.rst %{python3_sitelib}/%{modname} %{python3_sitelib}/%{modname}-*.egg-info +%exclude %{python3_sitelib}/%{modname}/tests + +%files -n python3-%{modname}-tests +%{python3_sitelib}/%{modname}/tests %endif %changelog -* Thu Jul 27 2017 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Apr 23 2017 Kevin Fenzi - 2.6.0-1 -- Update to 2.6.0. Fixes bug #1438613 - -* Sat Feb 11 2017 Fedora Release Engineering - 2.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 13 2017 Kevin Fenzi - 2.4.0-2 -- Update to 2.4.0. Fixes bug #1412598 - -* Mon Dec 19 2016 Miro Hrončok - 2.3.0-2 -- Rebuild for Python 3.6 - -* Wed Nov 23 2016 Kevin Fenzi - 2.3.0-1 -- Update to 2.3.0. Fixes bug #1395669 - -* Sat Aug 27 2016 Kevin Fenzi - 2.2.0-1 -- Update to 2.2.0. Fixes bug #1370675 - -* Tue Jul 19 2016 Fedora Release Engineering - 2.0.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Sun Apr 10 2016 Kevin Fenzi - 2.0.0-1 -- Update to 2.0.0. Fixes bug #1310914 - -* Fri Feb 19 2016 Ralph Bean - 1.17.0-1 -- new version - -* Thu Feb 04 2016 Fedora Release Engineering - 1.15.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 1.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Sep 22 2015 Alan Pevec 1.15.0-1 -- Update to upstream 1.15.0 -- only use unicodecsv for python 2.x - -* Thu Jun 25 2015 Alan Pevec 1.13.0-1 -- Update to upstream 1.13.0 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 30 2015 Ralph Bean - 1.10.0-2 -- Remove setuptools dep on argparse. - -* Wed Mar 04 2015 Ralph Bean - 1.10.0-1 -- new version -- Update list of files packages under %%doc. -- Explicitly package the license file. - -* Mon Sep 22 2014 Alan Pevec 1.7.0-1 -- Update to upstream 1.7.0 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 14 2014 Bohuslav Kabrda - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Thu Apr 17 2014 Ralph Bean - 1.6.1-1 -- Latest upstream. - -* Tue Jan 28 2014 Ralph Bean - 1.6.0-1 -- Latest upstream. -- Add dep on python-pbr (python build reasonableness) -- Add dep on python-stevedore -- Add build requirements on python-nose, python-mock, and bash -- Change check to use 'nosetests' directly. -- Remove bundled egg-info - -* Thu Nov 14 2013 Ralph Bean - 1.4.5-1 -- Latest upstream. -- Remove patch now that the latest cmd2 and pyparsing are required. - -* Thu Nov 14 2013 Ralph Bean - 1.4.4-2 -- Enable python3 subpackage now that python3-pyparsing is available. -- Adjust patch to simplify pyparsing setuptools constraints further. - -* Fri Sep 13 2013 Pádraig Brady - 1.4.4-1 -- Latest upstream. - -* Tue Aug 06 2013 Ralph Bean - 1.4-1 -- Latest upstream. - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Apr 10 2013 Ralph Bean - 1.3.2-1 -- Latest upstream. -- Patched pyparsing version constraint for py2. -- Modernized python3 conditional. -- Temporarily disabled python3 subpackage for python3-pyparsing dep. -- Added temporary explicit dependency on python3-pyparsing>=2.0.0. - -* Thu Feb 14 2013 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Jan 22 2013 Ralph Bean - 1.3-1 -- Latest upstream. -- Enabled python3 subpackage. -- Remove requirement on python-tablib - -* Sat Jul 21 2012 Fedora Release Engineering - 1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jul 06 2012 Ralph Bean - 1.0-3 -- Require python-argparse on epel. - -* Thu Jul 05 2012 Ralph Bean - 1.0-2 -- Manually disable python3 support until python3-prettytable is available. +* Thu Aug 10 2017 Alfredo Moralejo 2.8.0-1 +- Update to 2.8.0 -* Thu Jun 28 2012 Ralph Bean - 1.0-1 -- initial package for Fedora diff --git a/sources b/sources index 516a250..14a6753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cliff-2.6.0.tar.gz) = 195a8b2f2ad2cb8e579fbe999d2d3b622845ed04e8930e65bdcdd93ee2c0e3e6d575dfe04e087096c799ca35f554a8908537c7c46eb76577cb6dd9482bddf7c3 +SHA512 (cliff-2.8.0.tar.gz) = a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3