From 876bcc1500bc0eb921cfde14633c31b86e4475b5b88fe46ef970cd7a0f3c79c5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 7 Dec 2017 20:34:22 +0000 Subject: [PATCH] - update to version 5.1.0 - Remove setting of version/release from releasenotes - Make help message include choices information for StrOpt - Update reno for stable/pike - Fix the incorrect file path - Fix sphinx option generation when advanced=True - Empty groupname will be 'DEFAULT' by default - Remove the parameter enforce_type from set_override and set_default - Correct documentation error in DeprecatedOpt - Use boolean where expected - Remove redundant colon in doc - Implement OptGroup.__str__ for log messages - Added exception when namespace option is missing - Cleanup test-requirements - Prefer SNAP_COMMON config files - Updated from global requirements OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-oslo.config?expand=0&rev=62 --- _service | 4 +- oslo.config-4.11.1.tar.gz | 3 -- oslo.config-5.1.0.tar.gz | 3 ++ python-oslo.config.changes | 20 +++++++ python-oslo.config.spec | 106 ++++++++++++++++++++++++------------- 5 files changed, 94 insertions(+), 42 deletions(-) delete mode 100644 oslo.config-4.11.1.tar.gz create mode 100644 oslo.config-5.1.0.tar.gz diff --git a/_service b/_service index 0188bff..2e8b9c4 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ - https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/oslo.config/oslo.config.spec.j2 + https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/oslo.config/oslo.config.spec.j2 python-oslo.config.spec - https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt + https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt cloud-devel@suse.de gh,openstack,oslo.config diff --git a/oslo.config-4.11.1.tar.gz b/oslo.config-4.11.1.tar.gz deleted file mode 100644 index a405fd0..0000000 --- a/oslo.config-4.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1db25885036e1b6ad0ec93b2786e6bc36d88280a0553d1c2d03ca66ec8da84d5 -size 130922 diff --git a/oslo.config-5.1.0.tar.gz b/oslo.config-5.1.0.tar.gz new file mode 100644 index 0000000..224881e --- /dev/null +++ b/oslo.config-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e05c6eb428246387022ddc29f57782fee44396dd2d6218c1cae2332403673c30 +size 130695 diff --git a/python-oslo.config.changes b/python-oslo.config.changes index 2eaa1b2..705260e 100644 --- a/python-oslo.config.changes +++ b/python-oslo.config.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Dec 7 20:33:05 UTC 2017 - cloud-devel@suse.de + +- update to version 5.1.0 + - Remove setting of version/release from releasenotes + - Make help message include choices information for StrOpt + - Update reno for stable/pike + - Fix the incorrect file path + - Fix sphinx option generation when advanced=True + - Empty groupname will be 'DEFAULT' by default + - Remove the parameter enforce_type from set_override and set_default + - Correct documentation error in DeprecatedOpt + - Use boolean where expected + - Remove redundant colon in doc + - Implement OptGroup.__str__ for log messages + - Added exception when namespace option is missing + - Cleanup test-requirements + - Prefer SNAP_COMMON config files + - Updated from global requirements + ------------------------------------------------------------------- Thu Sep 28 06:58:37 UTC 2017 - cloud-devel@suse.de diff --git a/python-oslo.config.spec b/python-oslo.config.spec index 729e99b..8a3a1da 100644 --- a/python-oslo.config.spec +++ b/python-oslo.config.spec @@ -16,40 +16,64 @@ # -%global sname oslo.config Name: python-oslo.config -Version: 4.11.1 +Version: 5.1.0 Release: 0 Summary: OpenStack common configuration library License: Apache-2.0 Group: Development/Languages/Python -Url: https://launchpad.net/%{sname} -Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +Url: https://launchpad.net/oslo.config +Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-5.1.0.tar.gz BuildRequires: openstack-macros -BuildRequires: python-PyYAML >= 3.10.0 -BuildRequires: python-debtcollector >= 1.2.0 BuildRequires: python-devel -BuildRequires: python-fixtures >= 3.0.0 -BuildRequires: python-mock >= 2.0 -BuildRequires: python-netaddr >= 0.7.13 -BuildRequires: python-oslo.i18n >= 2.1.0 -BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 2.0.0 -BuildRequires: python-python-subunit >= 0.0.18 -BuildRequires: python-rfc3986 >= 0.3.1 -BuildRequires: python-six >= 1.9.0 -BuildRequires: python-stevedore >= 1.20.0 -BuildRequires: python-testrepository >= 0.0.18 -BuildRequires: python-testscenarios >= 0.4 -BuildRequires: python-testtools >= 1.4.0 -Requires: python-PyYAML >= 3.10.0 +BuildRequires: python2-PyYAML >= 3.10 +BuildRequires: python2-debtcollector >= 1.2.0 +BuildRequires: python2-fixtures >= 3.0.0 +BuildRequires: python2-mock >= 2.0.0 +BuildRequires: python2-netaddr >= 0.7.18 +BuildRequires: python2-oslo.i18n >= 3.15.3 +BuildRequires: python2-oslotest >= 1.10.0 +BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: python2-python-subunit >= 1.0.0 +BuildRequires: python2-rfc3986 >= 0.3.1 +BuildRequires: python2-six >= 1.10.0 +BuildRequires: python2-stevedore >= 1.20.0 +BuildRequires: python2-testrepository >= 0.0.18 +BuildRequires: python2-testscenarios >= 0.4 +BuildRequires: python2-testtools >= 2.2.0 +BuildRequires: python3-PyYAML >= 3.10 +BuildRequires: python3-debtcollector >= 1.2.0 +BuildRequires: python3-devel +BuildRequires: python3-fixtures >= 3.0.0 +BuildRequires: python3-mock >= 2.0.0 +BuildRequires: python3-netaddr >= 0.7.18 +BuildRequires: python3-oslo.i18n >= 3.15.3 +BuildRequires: python3-oslotest >= 1.10.0 +BuildRequires: python3-pbr >= 2.0.0 +BuildRequires: python3-python-subunit >= 1.0.0 +BuildRequires: python3-rfc3986 >= 0.3.1 +BuildRequires: python3-six >= 1.10.0 +BuildRequires: python3-stevedore >= 1.20.0 +BuildRequires: python3-testrepository >= 0.0.18 +BuildRequires: python3-testscenarios >= 0.4 +BuildRequires: python3-testtools >= 2.2.0 +Requires: python-PyYAML >= 3.10 Requires: python-debtcollector >= 1.2.0 -Requires: python-netaddr >= 0.7.13 -Requires: python-oslo.i18n >= 2.1.0 +Requires: python-netaddr >= 0.7.18 +Requires: python-oslo.i18n >= 3.15.3 Requires: python-rfc3986 >= 0.3.1 -Requires: python-six >= 1.9.0 +Requires: python-six >= 1.10.0 Requires: python-stevedore >= 1.20.0 BuildArch: noarch +%if 0%{?suse_version} +Requires(post): update-alternatives +Requires(postun): update-alternatives +%else +# on RDO, update-alternatives is in chkconfig +Requires(post): chkconfig +Requires(postun): chkconfig +%endif +%python_subpackages %description The Oslo project intends to produce a python library containing @@ -60,42 +84,50 @@ useful. The oslo-config library is a command line and configuration file parsing library from the Oslo project. -%package doc +%package -n python-oslo.config-doc Summary: Documentation for OpenStack common configuration library Group: Development/Languages/Python BuildRequires: python-Sphinx -BuildRequires: python-openstackdocstheme >= 1.16.0 +BuildRequires: python-openstackdocstheme >= 1.17.0 -%description doc +%description -n python-oslo.config-doc Documentation for the oslo-config library. %prep -%autosetup -n %{sname}-%{version} +%autosetup -p1 -n oslo.config-5.1.0 %py_req_cleanup sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%{py2_build} +%{python_build} %{__python2} setup.py build_sphinx # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %install -%{py2_install} +%{python_install} +%python_clone -a %{buildroot}%{_bindir}/oslo-config-generator + +%post +%python_install_alternative oslo-config-generator + +%postun +%python_uninstall_alternative oslo-config-generator %check -%{__python2} setup.py testr +%{python_expand rm -rf .testrepository +$python setup.py testr +} -%files -%doc README.rst +%files %{python_files} %license LICENSE -%{_bindir}/oslo-config-generator -%{python2_sitelib}/oslo_config -%{python2_sitelib}/*.egg-info +%python_alternative %{_bindir}/oslo-config-generator +%{python_sitelib}/oslo_config +%{python_sitelib}/*.egg-info -%files doc -%doc doc/build/html +%files -n python-oslo.config-doc +%doc doc/build/html README.rst %license LICENSE %changelog