diff --git a/centos_iso_image.inc b/centos_iso_image.inc index bb6f06d7..db7695bc 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -22,8 +22,6 @@ #python2-heatclient #python2-ironicclient #python2-keystoneclient -#python2-magnumclient -#python2-muranoclient #python2-neutronclient #python2-novaclient #python2-openstackclient diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 3b3f7f72..d8037df6 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,6 +1,4 @@ -#openstack/python-muranoclient #openstack/python-ironicclient -#openstack/python-magnumclient #openstack/openstack-ras #openstack/openstack-os-vif #openstack/python-aodhclient diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 642a16af..0e9d9228 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -1,4 +1,4 @@ -openstack-keystone-15.0.0-0.2.0rc2.el7.src.rpm +openstack-keystone-16.0.0-1.el7.src.rpm python-openstackdocstheme-1.11.0-1.el7.src.rpm python-osc-lib-1.7.0-1.el7.src.rpm python-oslo-messaging-10.2.0-2.el8.src.rpm diff --git a/openstack/python-aodhclient/centos/build_srpm.data b/openstack/python-aodhclient/centos/build_srpm.data index 63358a75..6e942cde 100644 --- a/openstack/python-aodhclient/centos/build_srpm.data +++ b/openstack/python-aodhclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=aodhclient SRC_DIR=$CGCS_BASE/git/python-aodhclient -TIS_BASE_SRCREV="1.2.0" +TIS_BASE_SRCREV="1.3.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-aodhclient/centos/python-aodhclient.spec b/openstack/python-aodhclient/centos/python-aodhclient.spec index 92b9ce78..079ab343 100644 --- a/openstack/python-aodhclient/centos/python-aodhclient.spec +++ b/openstack/python-aodhclient/centos/python-aodhclient.spec @@ -11,7 +11,7 @@ This is a client library for Aodh built on the Aodh API. It \ provides a Python API (the aodhclient module) and a command-line tool. Name: python-aodhclient -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Aodh @@ -43,6 +43,7 @@ Requires: python-oslo-utils >= 2.0.0 Requires: python-keystoneauth1 >= 1.0.0 Requires: python-six >= 1.9.0 Requires: python-osc-lib >= 1.0.1 +Requires: python-osprofiler >= 1.4.0 Requires: pyparsing %description -n python2-%{pypi_name} @@ -94,6 +95,7 @@ Requires: python3-oslo-utils >= 2.0.0 Requires: python3-keystoneauth1 >= 1.0.0 Requires: python3-six >= 1.9.0 Requires: python3-osc-lib >= 1.0.1 +Requires: python3-osprofiler >= 1.4.0 Requires: python3-pyparsing %description -n python3-%{pypi_name} diff --git a/openstack/python-barbicanclient/centos/build_srpm.data b/openstack/python-barbicanclient/centos/build_srpm.data index fe4a7c79..822f01ce 100644 --- a/openstack/python-barbicanclient/centos/build_srpm.data +++ b/openstack/python-barbicanclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-barbicanclient SRC_DIR=$CGCS_BASE/git/python-barbicanclient -TIS_BASE_SRCREV="4.8.1" +TIS_BASE_SRCREV="4.9.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-barbicanclient/centos/python-barbicanclient.spec b/openstack/python-barbicanclient/centos/python-barbicanclient.spec index 1c37e45b..a999ede4 100644 --- a/openstack/python-barbicanclient/centos/python-barbicanclient.spec +++ b/openstack/python-barbicanclient/centos/python-barbicanclient.spec @@ -11,7 +11,7 @@ Python library for accessing the API (barbicanclient module), and \ a command-line script (barbican). Name: python-barbicanclient -Version: 4.8.1 +Version: 4.9.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Client Library for OpenStack Barbican Key Management API diff --git a/openstack/python-cinderclient/centos/build_srpm.data b/openstack/python-cinderclient/centos/build_srpm.data index f9604a6f..7702b7e6 100644 --- a/openstack/python-cinderclient/centos/build_srpm.data +++ b/openstack/python-cinderclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-cinderclient SRC_DIR=$CGCS_BASE/git/python-cinderclient -TIS_BASE_SRCREV="4.1.0" +TIS_BASE_SRCREV="5.0.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-cinderclient/centos/python-cinderclient.spec b/openstack/python-cinderclient/centos/python-cinderclient.spec index 4d324db2..e4141f59 100644 --- a/openstack/python-cinderclient/centos/python-cinderclient.spec +++ b/openstack/python-cinderclient/centos/python-cinderclient.spec @@ -10,7 +10,7 @@ Client library (cinderclient python module) and command line utility \ (cinder) for interacting with OpenStack Cinder (Block Storage) API. Name: python-cinderclient -Version: 4.1.0 +Version: 5.0.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Cinder diff --git a/openstack/python-glanceclient/centos/build_srpm.data b/openstack/python-glanceclient/centos/build_srpm.data index 7a5bf4d1..697f92b2 100644 --- a/openstack/python-glanceclient/centos/build_srpm.data +++ b/openstack/python-glanceclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-glanceclient SRC_DIR="$CGCS_BASE/git/python-glanceclient" -TIS_BASE_SRCREV="2.16.0" +TIS_BASE_SRCREV="2.17.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-glanceclient/centos/python-glanceclient.spec b/openstack/python-glanceclient/centos/python-glanceclient.spec index 74796848..7d3e84a8 100644 --- a/openstack/python-glanceclient/centos/python-glanceclient.spec +++ b/openstack/python-glanceclient/centos/python-glanceclient.spec @@ -14,7 +14,7 @@ glanceclient module), and a command-line script (glance). Each implements \ Name: python-glanceclient Epoch: 1 -Version: 2.16.0 +Version: 2.17.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Glance diff --git a/openstack/python-heatclient/centos/build_srpm.data b/openstack/python-heatclient/centos/build_srpm.data index 3f6e54bb..5c1f49b5 100644 --- a/openstack/python-heatclient/centos/build_srpm.data +++ b/openstack/python-heatclient/centos/build_srpm.data @@ -1,5 +1,5 @@ TAR_NAME=python-heatclient SRC_DIR=$CGCS_BASE/git/python-heatclient -TIS_BASE_SRCREV="1.17.0" +TIS_BASE_SRCREV="1.18.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-heatclient/centos/python-heatclient.spec b/openstack/python-heatclient/centos/python-heatclient.spec index 1900d71b..a9fc912f 100644 --- a/openstack/python-heatclient/centos/python-heatclient.spec +++ b/openstack/python-heatclient/centos/python-heatclient.spec @@ -14,7 +14,7 @@ heatclient module), and a command-line script (heat). Each implements 100% of \ the OpenStack Heat API. Name: python-heatclient -Version: 1.17.0 +Version: 1.18.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Heat diff --git a/openstack/python-horizon/centos/build_srpm.data b/openstack/python-horizon/centos/build_srpm.data index 05fa20d8..fc9e6e1e 100755 --- a/openstack/python-horizon/centos/build_srpm.data +++ b/openstack/python-horizon/centos/build_srpm.data @@ -1,5 +1,5 @@ TAR_NAME=horizon SRC_DIR="$CGCS_BASE/git/horizon" COPY_LIST="$FILES_BASE/*" -TIS_BASE_SRCREV=a8df389822aaeaa29aded7e8c6614b51748ab914 -TIS_PATCH_VER=1 +TIS_BASE_SRCREV=817ee34d5a57409dc9945e6151a43d6747e5cc02 +TIS_PATCH_VER=2 diff --git a/openstack/python-horizon/centos/files/0001-Remove-the-hard-coded-internal-URL-for-keystone.patch b/openstack/python-horizon/centos/files/0001-Remove-the-hard-coded-internal-URL-for-keystone.patch new file mode 100644 index 00000000..6a7ad797 --- /dev/null +++ b/openstack/python-horizon/centos/files/0001-Remove-the-hard-coded-internal-URL-for-keystone.patch @@ -0,0 +1,27 @@ +From 0887c59ddffa53a8816e7a30f85fa49bdfce1881 Mon Sep 17 00:00:00 2001 +From: Andy Ning +Date: Thu, 30 Apr 2020 11:45:55 -0400 +Subject: [PATCH] Remove-the-hard-coded-internal-URL-for-keystone + +Signed-off-by: Andy Ning +--- + openstack_dashboard/api/keystone.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py +index af3d779..e4a9ef7 100644 +--- a/openstack_dashboard/api/keystone.py ++++ b/openstack_dashboard/api/keystone.py +@@ -79,7 +79,8 @@ class Service(base.APIDictWrapper): + super(Service, self).__init__(service, *args, **kwargs) + self.public_url = base.get_url_for_service(service, region, + 'publicURL') +- self.url = base.get_url_for_service(service, region, 'internalURL') ++ ep_type = getattr(settings, 'OPENSTACK_ENDPOINT_TYPE', 'internalURL') ++ self.url = base.get_url_for_service(service, region, ep_type) + if self.url: + self.host = urlparse.urlparse(self.url).hostname + else: +-- +1.8.3.1 + diff --git a/openstack/python-horizon/centos/python-django-horizon.spec b/openstack/python-horizon/centos/python-django-horizon.spec index 3a9c6b0e..a412d2ed 100755 --- a/openstack/python-horizon/centos/python-django-horizon.spec +++ b/openstack/python-horizon/centos/python-django-horizon.spec @@ -29,6 +29,9 @@ Source11: horizon-patching-restart Source13: guni_config.py Source14: horizon-assets-compress +# Patches +Patch1: 0001-Remove-the-hard-coded-internal-URL-for-keystone.patch + # # BuildArch needs to be located below patches in the spec file. Don't ask! # @@ -369,7 +372,6 @@ mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_s #ln -s ../../../../../%{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.json %{buildroot}%{_sysconfdir}/openstack-dashboard -mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/cinder_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/nova_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard @@ -472,7 +474,6 @@ systemctl daemon-reload >/dev/null 2>&1 || : %{_datadir}/openstack-dashboard/openstack_dashboard/.eslintrc %dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard -%dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.d/ %dir %attr(0750, apache, apache) %{_sharedstatedir}/openstack-dashboard %dir %attr(0750, apache, apache) %{_var}/log/horizon %config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf @@ -482,7 +483,6 @@ systemctl daemon-reload >/dev/null 2>&1 || : %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.json %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.json -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.d/consistencygroup.yaml %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.d/api-extensions.yaml %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/logrotate.d/openstack-dashboard %attr(755,root,root) %dir %{_unitdir}/httpd.service.d diff --git a/openstack/python-ironicclient/centos/build_srpm.data b/openstack/python-ironicclient/centos/build_srpm.data index c6f72766..77dcd2ef 100644 --- a/openstack/python-ironicclient/centos/build_srpm.data +++ b/openstack/python-ironicclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME="python-ironicclient" SRC_DIR="$CGCS_BASE/git/python-ironicclient" -TIS_BASE_SRCREV="2.7.0" +TIS_BASE_SRCREV="3.1.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-ironicclient/centos/python-ironicclient.spec b/openstack/python-ironicclient/centos/python-ironicclient.spec index a656271e..6e20b67d 100644 --- a/openstack/python-ironicclient/centos/python-ironicclient.spec +++ b/openstack/python-ironicclient/centos/python-ironicclient.spec @@ -9,7 +9,7 @@ %global common_desc A python and command line client library for Ironic Name: python-ironicclient -Version: 2.7.0 +Version: 3.1.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python client for Ironic @@ -35,12 +35,12 @@ BuildRequires: python2-wheel Requires: python2-appdirs >= 1.3.0 Requires: python2-keystoneauth1 >= 3.4.0 Requires: python2-pbr >= 2.0.0 -Requires: python2-prettytable Requires: python2-six >= 1.10.0 Requires: python2-osc-lib >= 1.10.0 Requires: python2-oslo-i18n >= 3.15.3 Requires: python2-oslo-serialization >= 2.18.0 Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-oslo-config >= 5.2.0 Requires: python2-requests %if 0%{?fedora} > 0 Requires: python2-dogpile-cache >= 0.6.2 @@ -71,12 +71,12 @@ Requires: python3-dogpile-cache >= 0.6.2 Requires: python3-jsonschema Requires: python3-keystoneauth1 >= 3.4.0 Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable Requires: python3-six >= 1.10.0 Requires: python3-osc-lib >= 1.10.0 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-oslo-serialization >= 2.18.0 Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-oslo-config >= 5.2.0 Requires: python3-requests Requires: python3-PyYAML @@ -106,26 +106,16 @@ export PBR_VERSION=%{version} export PBR_VERSION=%{version} %if 0%{?with_python3} %py3_install -mv %{buildroot}%{_bindir}/ironic %{buildroot}%{_bindir}/ironic-%{python3_version} -ln -s ./ironic-%{python3_version} %{buildroot}%{_bindir}/ironic-3 %endif %py2_install -mv %{buildroot}%{_bindir}/ironic %{buildroot}%{_bindir}/ironic-%{python2_version} -ln -s ./ironic-%{python2_version} %{buildroot}%{_bindir}/ironic-2 - -ln -s ./ironic-2 %{buildroot}%{_bindir}/ironic mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - %files -n python2-%{sname} %doc README.rst %license LICENSE -%{_bindir}/ironic -%{_bindir}/ironic-2 -%{_bindir}/ironic-%{python2_version} %{python2_sitelib}/ironicclient* %{python2_sitelib}/python_ironicclient* @@ -133,8 +123,6 @@ install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ %files -n python3-%{sname} %doc README.rst %license LICENSE -%{_bindir}/ironic-3 -%{_bindir}/ironic-%{python3_version} %{python3_sitelib}/ironicclient* %{python3_sitelib}/python_ironicclient* %endif diff --git a/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch b/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch index 23cb18b0..6fb76e27 100644 --- a/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch +++ b/openstack/python-keystone/centos/meta_patches/Add-keyring-patch.patch @@ -9,7 +9,7 @@ Signed-off-by: Yong Fu 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec -index a20bda1..945de6d 100644 +index d3ec1d7..3d5fcee 100644 --- a/SPECS/openstack-keystone.spec +++ b/SPECS/openstack-keystone.spec @@ -27,7 +27,7 @@ Name: openstack-keystone diff --git a/openstack/python-keystone/centos/meta_patches/Update-spec-with-stx-additions.patch b/openstack/python-keystone/centos/meta_patches/Update-spec-with-stx-additions.patch index b666949f..086ac170 100644 --- a/openstack/python-keystone/centos/meta_patches/Update-spec-with-stx-additions.patch +++ b/openstack/python-keystone/centos/meta_patches/Update-spec-with-stx-additions.patch @@ -9,7 +9,7 @@ Signed-off-by: Yong Fu 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec -index 945de6d..74b6ba2 100644 +index 3d5fcee..97c0586 100644 --- a/SPECS/openstack-keystone.spec +++ b/SPECS/openstack-keystone.spec @@ -11,7 +11,8 @@ diff --git a/openstack/python-keystoneauth1/centos/build_srpm.data b/openstack/python-keystoneauth1/centos/build_srpm.data index e4ca2b49..85caaebf 100644 --- a/openstack/python-keystoneauth1/centos/build_srpm.data +++ b/openstack/python-keystoneauth1/centos/build_srpm.data @@ -1,5 +1,5 @@ TAR_NAME=keystoneauth1 SRC_DIR="$CGCS_BASE/git/python-keystoneauth" -TIS_BASE_SRCREV=bde07bc95b5b5d16b829f72be7aaa62fab9d716a +TIS_BASE_SRCREV=1d5f57258af4e429995bf4c02137d24fe32c36e1 TIS_PATCH_VER=GITREVCOUNT+0 diff --git a/openstack/python-keystoneauth1/centos/python-keystoneauth1.spec b/openstack/python-keystoneauth1/centos/python-keystoneauth1.spec index da97ea23..0b585d95 100644 --- a/openstack/python-keystoneauth1/centos/python-keystoneauth1.spec +++ b/openstack/python-keystoneauth1/centos/python-keystoneauth1.spec @@ -1,3 +1,14 @@ +# Macros for py2/py3 compatibility +%if 0%{?fedora} || 0%{?rhel} > 7 +%global pyver %{python3_pkgversion} +%else +%global pyver 2 +%endif +%global pyver_bin python%{pyver} +%global pyver_sitelib %python%{pyver}_sitelib +%global pyver_install %py%{pyver}_install +%global pyver_build %py%{pyver}_build +# End of macros for py2/py3 compatibility %global pypi_name keystoneauth1 %global common_desc \ @@ -6,15 +17,13 @@ within the OpenStack ecosystem. It is designed for use in conjunction with \ the existing OpenStack clients and for simplifying the process of writing \ new clients. -%if 0%{?fedora} >= 24 -%global with_python3 1 -%endif +%global with_doc 1 %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: python-%{pypi_name} -Version: 3.13.1 -Release: 1%{?_tis_dist}.%{tis_patch_ver} +Version: 3.17.1 +Release: 2%{?_tis_dist}.%{tis_patch_ver} Summary: Authentication Library for OpenStack Clients License: ASL 2.0 URL: https://pypi.io/pypi/%{pypi_name} @@ -25,101 +34,69 @@ BuildArch: noarch %description %{common_desc} -%package -n python2-%{pypi_name} +%package -n python%{pyver}-%{pypi_name} Summary: Authentication Libarary for OpenStack Identity -%{?python_provide:%python_provide python2-%{pypi_name}} -%{?python_provide:%python_provide python2-keystoneauth} +%{?python_provide:%python_provide python%{pyver}-%{pypi_name}} +%{?python_provide:%python_provide python%{pyver}-keystoneauth} BuildRequires: git -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-six -BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: python%{pyver}-devel +BuildRequires: python%{pyver}-setuptools +BuildRequires: python%{pyver}-six +BuildRequires: python%{pyver}-pbr >= 2.0.0 # test requires -# BuildRequires: python2-betamax >= 0.7.0 +#BuildRequires: python%{pyver}-betamax >= 0.7.0 BuildRequires: python-betamax >= 0.7.0 -BuildRequires: python2-fixtures >= 1.3.1 -BuildRequires: python2-oslotest -BuildRequires: python2-oslo-utils -BuildRequires: python2-os-testr -BuildRequires: python2-oauthlib -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python2-pyyaml -BuildRequires: python2-lxml -BuildRequires: python2-requests-kerberos -BuildRequires: python2-requests-mock >= 1.1 -%else +BuildRequires: python%{pyver}-fixtures >= 1.3.1 +BuildRequires: python%{pyver}-mock +BuildRequires: python%{pyver}-oslotest +BuildRequires: python%{pyver}-oslo-config +BuildRequires: python%{pyver}-oslo-utils +BuildRequires: python%{pyver}-stestr +BuildRequires: python%{pyver}-oauthlib +BuildRequires: python%{pyver}-requests +BuildRequires: python%{pyver}-os-service-types +BuildRequires: python%{pyver}-stevedore +BuildRequires: python%{pyver}-iso8601 +BuildRequires: python%{pyver}-requests-mock >= 1.1 + +# Handle python2 exception +%if %{pyver} == 2 BuildRequires: PyYAML BuildRequires: python-lxml BuildRequires: python-requests-kerberos -BuildRequires: python-requests-mock >= 1.1 +BuildRequires: python-pep8 +%else +BuildRequires: python%{pyver}-PyYAML +BuildRequires: python%{pyver}-lxml +BuildRequires: python%{pyver}-requests-kerberos +BuildRequires: python%{pyver}-pep8 %endif -Requires: python2-iso8601 >= 0.1.11 -Requires: python2-os-service-types >= 1.2.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-requests >= 2.14.2 -Requires: python2-six => 1.10.0 -Requires: python2-stevedore >= 1.20.0 +Requires: python%{pyver}-iso8601 >= 0.1.11 +Requires: python%{pyver}-os-service-types >= 1.2.0 +Requires: python%{pyver}-pbr >= 2.0.0 +Requires: python%{pyver}-requests >= 2.14.2 +Requires: python%{pyver}-six => 1.10.0 +Requires: python%{pyver}-stevedore >= 1.20.0 -%description -n python2-%{pypi_name} +%description -n python%{pyver}-%{pypi_name} %{common_desc} -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: Authentication Libarary for OpenStack Identity -Provides: python3-keystoneauth = %{version}-%{release} -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-sphinx - -# test requres -BuildRequires: python3-betamax >= 0.7.0 -BuildRequires: python3-fixtures >= 1.3.1 -BuildRequires: python3-lxml -BuildRequires: python3-requests-mock >= 1.1 -BuildRequires: python3-oslotest -BuildRequires: python3-oslo-utils -BuildRequires: python3-os-testr -BuildRequires: python3-oauthlib -BuildRequires: python3-PyYAML - -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-os-service-types -Requires: python3-pbr >= 2.0.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six => 1.10.0 -Requires: python3-stevedore >= 1.20.0 - -%description -n python3-%{pypi_name} -%{common_desc} -%endif - -%package doc +%if 0%{?with_doc} +%package -n python-%{pypi_name}-doc Summary: Documentation for OpenStack Identity Authentication Library -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-mock -BuildRequires: python2-requests -BuildRequires: python2-mox3 -BuildRequires: python2-oslo-config -BuildRequires: python2-os-service-types -BuildRequires: python2-stevedore -BuildRequires: python2-iso8601 -BuildRequires: python2-fixtures -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python2-pep8 -%else -BuildRequires: python-pep8 +BuildRequires: python%{pyver}-sphinx +BuildRequires: python%{pyver}-sphinxcontrib-apidoc +BuildRequires: python%{pyver}-openstackdocstheme +BuildRequires: python%{pyver}-mox3 + +%description -n python-%{pypi_name}-doc +Documentation for OpenStack Identity Authentication Library %endif -%description doc -Documentation for OpenStack Identity Authentication Library %prep %autosetup -n %{pypi_name}-%{upstream_version} -S git @@ -132,51 +109,39 @@ rm -rf {test-,}requirements.txt rm -rf %{pypi_name}.egg-info %build -%py2_build -%if 0%{?with_python3} -%py3_build -%endif +%{pyver_build} %install -%py2_install -%if 0%{?with_python3} -%py3_install -%endif +%{pyver_install} +%if 0%{?with_doc} # generate html docs -%{__python} setup.py build_sphinx -b html +export PYTHONPATH=. +# Disabling warning-is-error because of issue with python2 giving a warning: +# "The config value `apidoc_module_dir' has type `unicode', expected to ['str']." +sphinx-build-%{pyver} -b html -d doc/build/doctrees doc/source doc/build/html rm -rf doc/build/html/.buildinfo - -# %check -# %{__python2} /usr/bin/ostestr -# %if 0%{?with_python3} -# # cleanup testrepository -# rm -rf .testrepository -# %{__python3} /usr/bin/ostestr -# %endif - -%files -n python2-%{pypi_name} -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/*.egg-info - -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%doc README.rst -%license LICENSE -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/*.egg-info %endif -%files doc +%check +PYTHON=python%{pyver} stestr-%{pyver} run + +%files -n python%{pyver}-%{pypi_name} +%doc README.rst +%license LICENSE +%{pyver_sitelib}/%{pypi_name} +%{pyver_sitelib}/*.egg-info + +%if 0%{?with_doc} +%files -n python-%{pypi_name}-doc %license LICENSE %doc doc/build/html +%endif %changelog -* Tue Mar 07 2019 3.13.1 -- Update to 3.13.1 +* Thu Oct 03 2019 Joel Capitao 3.17.1-2 +- Removed python2 subpackages in no el7 distros -* Tue Aug 07 2018 RDO 3.10.0-1 -- Update to 3.10.0 +* Wed Sep 18 2019 RDO 3.17.1-1 +- Update to 3.17.1 diff --git a/openstack/python-keystoneclient/centos/build_srpm.data b/openstack/python-keystoneclient/centos/build_srpm.data index d54a1b99..b4967a14 100644 --- a/openstack/python-keystoneclient/centos/build_srpm.data +++ b/openstack/python-keystoneclient/centos/build_srpm.data @@ -1,5 +1,5 @@ TAR_NAME=python-keystoneclient SRC_DIR=$CGCS_BASE/git/python-keystoneclient -TIS_BASE_SRCREV="3.19.0" +TIS_BASE_SRCREV="3.21.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-keystoneclient/centos/python-keystoneclient.spec b/openstack/python-keystoneclient/centos/python-keystoneclient.spec index 25ae179f..1b82f22a 100644 --- a/openstack/python-keystoneclient/centos/python-keystoneclient.spec +++ b/openstack/python-keystoneclient/centos/python-keystoneclient.spec @@ -1,17 +1,27 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%if 0%{?fedora} -%global with_python3 1 +# Macros for py2/py3 compatibility +%if 0%{?fedora} || 0%{?rhel} > 7 +%global pyver %{python3_pkgversion} +%else +%global pyver 2 %endif +%global pyver_bin python%{pyver} +%global pyver_sitelib %python%{pyver}_sitelib +%global pyver_install %py%{pyver}_install +%global pyver_build %py%{pyver}_build +# End of macros for py2/py3 compatibility +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global common_desc \ Client library and command line utility for interacting with Openstack \ Identity API. +%global sname keystoneclient +%global with_doc 1 + Name: python-keystoneclient Epoch: 1 -Version: 3.19.0 -Release: 1%{?_tis_dist}.%{tis_patch_ver} +Version: 3.21.0 +Release: 2%{?_tis_dist}.%{tis_patch_ver} Summary: Client library for OpenStack Identity API License: ASL 2.0 URL: https://launchpad.net/python-keystoneclient @@ -25,158 +35,97 @@ BuildRequires: /usr/bin/openssl %description %{common_desc} -%package -n python2-keystoneclient +%package -n python%{pyver}-%{sname} Summary: Client library for OpenStack Identity API -%{?python_provide:%python_provide python2-keystoneclient} +%{?python_provide:%python_provide python%{pyver}-%{sname}} +%if %{pyver} == 3 +Obsoletes: python2-%{sname} < %{version}-%{release} +%endif -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pip -BuildRequires: python2-wheel -BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: python%{pyver}-devel +BuildRequires: python%{pyver}-setuptools +BuildRequires: python%{pyver}-pbr >= 2.0.0 BuildRequires: git -Requires: python2-oslo-config >= 2:5.2.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 -Requires: python2-stevedore >= 1.20.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-debtcollector >= 1.2.0 -Requires: python2-keystoneauth1 >= 3.4.0 -%if 0%{?fedora} > 0 -Requires: python2-keyring >= 5.5.1 -%else +Requires: python%{pyver}-oslo-config >= 2:5.2.0 +Requires: python%{pyver}-oslo-i18n >= 3.15.3 +Requires: python%{pyver}-oslo-serialization >= 2.18.0 +Requires: python%{pyver}-oslo-utils >= 3.33.0 +Requires: python%{pyver}-requests >= 2.14.2 +Requires: python%{pyver}-six >= 1.10.0 +Requires: python%{pyver}-stevedore >= 1.20.0 +Requires: python%{pyver}-pbr >= 2.0.0 +Requires: python%{pyver}-debtcollector >= 1.2.0 +Requires: python%{pyver}-keystoneauth1 >= 3.4.0 +# Handle python2 exception +%if %{pyver} == 2 Requires: python-keyring >= 5.5.1 +%else +Requires: python%{pyver}-keyring >= 5.5.1 %endif -%description -n python2-keystoneclient +%description -n python%{pyver}-%{sname} %{common_desc} -%if 0%{?with_python3} -%package -n python3-keystoneclient -Summary: Client library for OpenStack Identity API -%{?python_provide:%python_provide python3-keystoneclient} +%package -n python%{pyver}-%{sname}-tests +Summary: Python API and CLI for OpenStack Keystone (tests) +%{?python_provide:%python_provide python%{pyver}-%{sname}-tests} +Requires: python%{pyver}-%{sname} = %{epoch}:%{version}-%{release} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 - -Requires: python3-oslo-config >= 2:5.2.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-stevedore >= 1.20.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-debtcollector >= 1.2.0 -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-keyring >= 5.5.1 - -%description -n python3-keystoneclient -Client library for interacting with Openstack Identity API. -%endif - -%package -n python2-keystoneclient-tests -Summary: python2-keystoneclient test subpackage -Requires: python2-keystoneclient = %{epoch}:%{version}-%{release} - -BuildRequires: python2-hacking -BuildRequires: python2-fixtures -BuildRequires: python2-mock -BuildRequires: python2-oauthlib -BuildRequires: python2-oslotest -BuildRequires: python2-testtools -BuildRequires: python2-keystoneauth1 -BuildRequires: python2-oslo-config -BuildRequires: python2-oslo-utils -BuildRequires: python2-oslo-serialization -BuildRequires: python2-oslo-i18n -BuildRequires: python2-stestr -BuildRequires: python2-testresources -BuildRequires: python2-testscenarios -%if 0%{?fedora} > 0 -BuildRequires: python2-keyring >= 5.5.1 -BuildRequires: python2-lxml -BuildRequires: python2-requests-mock -%else +BuildRequires: python%{pyver}-hacking +BuildRequires: python%{pyver}-fixtures +BuildRequires: python%{pyver}-mock +BuildRequires: python%{pyver}-oauthlib +BuildRequires: python%{pyver}-oslotest +BuildRequires: python%{pyver}-testtools +BuildRequires: python%{pyver}-keystoneauth1 +BuildRequires: python%{pyver}-oslo-config +BuildRequires: python%{pyver}-oslo-utils +BuildRequires: python%{pyver}-oslo-serialization +BuildRequires: python%{pyver}-oslo-i18n +BuildRequires: python%{pyver}-stestr +BuildRequires: python%{pyver}-testresources +BuildRequires: python%{pyver}-testscenarios +BuildRequires: python%{pyver}-requests-mock +# Handle python2 exception +%if %{pyver} == 2 BuildRequires: python-keyring >= 5.5.1 BuildRequires: python-lxml -BuildRequires: python-requests-mock -%endif - -Requires: python2-hacking -Requires: python2-fixtures -Requires: python2-mock -Requires: python2-oauthlib -Requires: python2-oslotest -Requires: python2-stestr -Requires: python2-testtools -Requires: python2-testresources -Requires: python2-testscenarios -%if 0%{?fedora} > 0 -Requires: python2-lxml -Requires: python2-requests-mock %else +BuildRequires: python%{pyver}-keyring >= 5.5.1 +BuildRequires: python%{pyver}-lxml +%endif + +Requires: python%{pyver}-hacking +Requires: python%{pyver}-fixtures +Requires: python%{pyver}-mock +Requires: python%{pyver}-oauthlib +Requires: python%{pyver}-oslotest +Requires: python%{pyver}-stestr +Requires: python%{pyver}-testtools +Requires: python%{pyver}-testresources +Requires: python%{pyver}-testscenarios +Requires: python%{pyver}-requests-mock +# Handle python2 exception +%if %{pyver} == 2 Requires: python-lxml -Requires: python-requests-mock +%else +Requires: python%{pyver}-lxml %endif +%description -n python%{pyver}-%{sname}-tests +{common_desc} -%description -n python2-keystoneclient-tests -python2-keystoneclient test subpackages - -%if 0%{?with_python3} -%package -n python3-keystoneclient-tests -Summary: python3-keystoneclient test subpackage -Requires: python3-keystoneclient = %{epoch}:%{version}-%{release} - -BuildRequires: python3-hacking -BuildRequires: python3-fixtures -BuildRequires: python3-keyring >= 5.5.1 -BuildRequires: python3-lxml -BuildRequires: python3-mock -BuildRequires: python3-oauthlib -BuildRequires: python3-oslotest -BuildRequires: python3-requests-mock -BuildRequires: python3-testresources -BuildRequires: python3-testscenarios -BuildRequires: python3-testtools -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-utils -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-i18n -BuildRequires: python3-stestr - -Requires: python3-hacking -Requires: python3-fixtures -Requires: python3-lxml -Requires: python3-mock -Requires: python3-oauthlib -Requires: python3-oslotest -Requires: python3-requests-mock -Requires: python3-stestr -Requires: python3-testresources -Requires: python3-testscenarios -Requires: python3-testtools - - -%description -n python3-keystoneclient-tests -python3-keystoneclient test subpackages -%endif - -%package doc +%if 0%{?with_doc} +%package -n python-%{sname}-doc Summary: Documentation for OpenStack Keystone API client -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme +BuildRequires: python%{pyver}-sphinx +BuildRequires: python%{pyver}-openstackdocstheme -%description doc -Documentation for the keystoneclient module +%description -n python-%{sname}-doc +{common_desc} +%endif %prep %autosetup -n %{name}-%{upstream_version} -S git @@ -190,28 +139,17 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg rm -rf {test-,}requirements.txt %build -export PBR_VERSION=%{version} -%py2_build -%py2_build_wheel -%if 0%{?with_python3} -%py3_build -%endif +%{pyver_build} %install -export PBR_VERSION=%{version} -%py2_install -%if 0%{?with_python3} -%py3_install -%endif +%{pyver_install} +%if 0%{?with_doc} # Build HTML docs -%{__python2} setup.py build_sphinx -b html +%{pyver_bin} setup.py build_sphinx -b html # Fix hidden-file-or-dir warnings rm -fr doc/build/html/.{doctrees,buildinfo} - -# STX: stage wheels -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ +%endif #%check #stestr --test-path=./keystoneclient/tests/unit run @@ -219,48 +157,27 @@ install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ #stestr-3 --test-path=./keystoneclient/tests/unit run #%endif -%files -n python2-keystoneclient +%files -n python%{pyver}-%{sname} %license LICENSE %doc README.rst -%{python2_sitelib}/keystoneclient -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/keystoneclient/tests +%{pyver_sitelib}/%{sname} +%{pyver_sitelib}/*.egg-info +%exclude %{pyver_sitelib}/%{sname}/tests -%if 0%{?with_python3} -%files -n python3-keystoneclient -%license LICENSE -%doc README.rst -%{python3_sitelib}/keystoneclient -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/keystoneclient/tests -%endif - -%files doc +%if 0%{?with_doc} +%files -n python-%{sname}-doc %doc doc/build/html %license LICENSE - -%files -n python2-keystoneclient-tests -%license LICENSE -%{python2_sitelib}/keystoneclient/tests - -%if 0%{?with_python3} -%files -n python3-keystoneclient-tests -%license LICENSE -%{python3_sitelib}/keystoneclient/tests %endif - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* - +%files -n python%{pyver}-%{sname}-tests +%license LICENSE +%{pyver_sitelib}/%{sname}/tests %changelog -* Wed Aug 08 2018 RDO 1:3.17.0-1 -- Update to 3.17.0 +* Thu Oct 03 2019 Joel Capitao 1:3.21.0-2 +- Removed python2 subpackages in no el7 distros + +* Thu Sep 19 2019 RDO 1:3.21.0-1 +- Update to 3.21.0 diff --git a/openstack/python-keystoneclient/centos/python-keystoneclient.spec.3.19 b/openstack/python-keystoneclient/centos/python-keystoneclient.spec.3.19 new file mode 100644 index 00000000..12e9ec4a --- /dev/null +++ b/openstack/python-keystoneclient/centos/python-keystoneclient.spec.3.19 @@ -0,0 +1,266 @@ +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + +%if 0%{?fedora} +%global with_python3 1 +%endif + +%global common_desc \ +Client library and command line utility for interacting with Openstack \ +Identity API. + +Name: python-keystoneclient +Epoch: 1 +Version: 3.19.0 +Release: 1%{?_tis_dist}.%{tis_patch_ver} +Summary: Client library for OpenStack Identity API +License: ASL 2.0 +URL: https://launchpad.net/python-keystoneclient +Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz + +BuildArch: noarch + +BuildRequires: /usr/bin/openssl + + +%description +%{common_desc} + +%package -n python2-keystoneclient +Summary: Client library for OpenStack Identity API +%{?python_provide:%python_provide python2-keystoneclient} + +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pip +BuildRequires: python2-wheel +BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: git + +Requires: python2-oslo-config >= 2:5.2.0 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-oslo-serialization >= 2.18.0 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-requests >= 2.14.2 +Requires: python2-six >= 1.10.0 +Requires: python2-stevedore >= 1.20.0 +Requires: python2-pbr >= 2.0.0 +Requires: python2-debtcollector >= 1.2.0 +Requires: python2-keystoneauth1 >= 3.4.0 +%if 0%{?fedora} > 0 +Requires: python2-keyring >= 5.5.1 +%else +Requires: python-keyring >= 5.5.1 +%endif + +%description -n python2-keystoneclient +%{common_desc} + +%if 0%{?with_python3} +%package -n python3-keystoneclient +Summary: Client library for OpenStack Identity API +%{?python_provide:%python_provide python3-keystoneclient} + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr >= 2.0.0 + +Requires: python3-oslo-config >= 2:5.2.0 +Requires: python3-oslo-i18n >= 3.15.3 +Requires: python3-oslo-serialization >= 2.18.0 +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-requests >= 2.14.2 +Requires: python3-six >= 1.10.0 +Requires: python3-stevedore >= 1.20.0 +Requires: python3-pbr >= 2.0.0 +Requires: python3-debtcollector >= 1.2.0 +Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-keyring >= 5.5.1 + +%description -n python3-keystoneclient +Client library for interacting with Openstack Identity API. +%endif + +%package -n python2-keystoneclient-tests +Summary: python2-keystoneclient test subpackage +Requires: python2-keystoneclient = %{epoch}:%{version}-%{release} + +BuildRequires: python2-hacking +BuildRequires: python2-fixtures +BuildRequires: python2-mock +BuildRequires: python2-oauthlib +BuildRequires: python2-oslotest +BuildRequires: python2-testtools +BuildRequires: python2-keystoneauth1 +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-utils +BuildRequires: python2-oslo-serialization +BuildRequires: python2-oslo-i18n +BuildRequires: python2-stestr +BuildRequires: python2-testresources +BuildRequires: python2-testscenarios +%if 0%{?fedora} > 0 +BuildRequires: python2-keyring >= 5.5.1 +BuildRequires: python2-lxml +BuildRequires: python2-requests-mock +%else +BuildRequires: python-keyring >= 5.5.1 +BuildRequires: python-lxml +BuildRequires: python-requests-mock +%endif + +Requires: python2-hacking +Requires: python2-fixtures +Requires: python2-mock +Requires: python2-oauthlib +Requires: python2-oslotest +Requires: python2-stestr +Requires: python2-testtools +Requires: python2-testresources +Requires: python2-testscenarios +%if 0%{?fedora} > 0 +Requires: python2-lxml +Requires: python2-requests-mock +%else +Requires: python-lxml +Requires: python-requests-mock +%endif + + +%description -n python2-keystoneclient-tests +python2-keystoneclient test subpackages + +%if 0%{?with_python3} +%package -n python3-keystoneclient-tests +Summary: python3-keystoneclient test subpackage +Requires: python3-keystoneclient = %{epoch}:%{version}-%{release} + +BuildRequires: python3-hacking +BuildRequires: python3-fixtures +BuildRequires: python3-keyring >= 5.5.1 +BuildRequires: python3-lxml +BuildRequires: python3-mock +BuildRequires: python3-oauthlib +BuildRequires: python3-oslotest +BuildRequires: python3-requests-mock +BuildRequires: python3-testresources +BuildRequires: python3-testscenarios +BuildRequires: python3-testtools +BuildRequires: python3-keystoneauth1 +BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-utils +BuildRequires: python3-oslo-serialization +BuildRequires: python3-oslo-i18n +BuildRequires: python3-stestr + +Requires: python3-hacking +Requires: python3-fixtures +Requires: python3-lxml +Requires: python3-mock +Requires: python3-oauthlib +Requires: python3-oslotest +Requires: python3-requests-mock +Requires: python3-stestr +Requires: python3-testresources +Requires: python3-testscenarios +Requires: python3-testtools + + +%description -n python3-keystoneclient-tests +python3-keystoneclient test subpackages +%endif + +%package doc +Summary: Documentation for OpenStack Keystone API client + +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme + +%description doc +Documentation for the keystoneclient module + +%prep +%autosetup -n %{name}-%{upstream_version} -S git + +# disable warning-is-error, this project has intersphinx in docs +# so some warnings are generated in network isolated build environment +# as koji +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg + +# Let RPM handle the dependencies +rm -rf {test-,}requirements.txt + +%build +export PBR_VERSION=%{version} +%py2_build +%py2_build_wheel +%if 0%{?with_python3} +%py3_build +%endif + +%install +export PBR_VERSION=%{version} +%py2_install +%if 0%{?with_python3} +%py3_install +%endif + +# Build HTML docs +%{__python2} setup.py build_sphinx -b html +# Fix hidden-file-or-dir warnings +rm -fr doc/build/html/.{doctrees,buildinfo} + +# STX: stage wheels +mkdir -p $RPM_BUILD_ROOT/wheels +install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ + +%check +stestr --test-path=./keystoneclient/tests/unit run +%if 0%{?with_python3} +stestr-3 --test-path=./keystoneclient/tests/unit run +%endif + +%files -n python2-keystoneclient +%license LICENSE +%doc README.rst +%{python2_sitelib}/keystoneclient +%{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/keystoneclient/tests + +%if 0%{?with_python3} +%files -n python3-keystoneclient +%license LICENSE +%doc README.rst +%{python3_sitelib}/keystoneclient +%{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/keystoneclient/tests +%endif + +%files doc +%doc doc/build/html +%license LICENSE + +%files -n python2-keystoneclient-tests +%license LICENSE +%{python2_sitelib}/keystoneclient/tests + +%if 0%{?with_python3} +%files -n python3-keystoneclient-tests +%license LICENSE +%{python3_sitelib}/keystoneclient/tests +%endif + + +%package wheels +Summary: %{name} wheels + +%description wheels +Contains python wheels for %{name} + +%files wheels +/wheels/* + + +%changelog +* Wed Aug 08 2018 RDO 1:3.17.0-1 +- Update to 3.17.0 + diff --git a/openstack/python-magnumclient/centos/build_srpm.data b/openstack/python-magnumclient/centos/build_srpm.data deleted file mode 100644 index c73da696..00000000 --- a/openstack/python-magnumclient/centos/build_srpm.data +++ /dev/null @@ -1,5 +0,0 @@ -TAR_NAME="python-magnumclient" -SRC_DIR="$CGCS_BASE/git/python-magnumclient" -TIS_BASE_SRCREV="2.12.0" -TIS_PATCH_VER=GITREVCOUNT - diff --git a/openstack/python-magnumclient/centos/python-magnumclient.spec b/openstack/python-magnumclient/centos/python-magnumclient.spec deleted file mode 100644 index 129b6717..00000000 --- a/openstack/python-magnumclient/centos/python-magnumclient.spec +++ /dev/null @@ -1,266 +0,0 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global sname python-magnumclient -%global pname magnumclient - -%if 0%{?fedora} >= 24 -%global with_python3 1 -%global default_python 3 -%else -%global default_python 2 -%endif - -%global common_desc \ -This is a client library for Magnum built on the Magnum API. \ -It provides a Python API (the magnumclient module) and a \ -command-line tool (magnum). - -%global common_desc_tests Python-magnumclient test subpackage - -Name: python-%{pname} -Version: 2.12.0 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Client library for Magnum API - -License: ASL 2.0 -URL: https://launchpad.net/python-magnumclient -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz -BuildArch: noarch - -%description -%{common_desc} - -%package -n python2-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python2-%{pname}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pip -BuildRequires: python2-wheel -BuildRequires: python2-pbr -BuildRequires: git - -# test dependencies -BuildRequires: python2-oslo-utils -BuildRequires: python2-openstackclient -BuildRequires: python2-oslo-serialization -BuildRequires: python2-oslo-log -BuildRequires: python2-osprofiler -BuildRequires: python2-stevedore -BuildRequires: python2-requests -BuildRequires: python2-oslo-i18n -BuildRequires: python2-fixtures -BuildRequires: python2-mock -BuildRequires: python2-testtools -BuildRequires: python2-keystoneauth1 -BuildRequires: python2-prettytable - -Requires: python2-babel -Requires: python2-cryptography -Requires: python2-keystoneauth1 >= 3.4.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-osc-lib >= 1.8.0 -Requires: python2-os-client-config >= 1.28.0 -Requires: python2-pbr -Requires: python2-prettytable -Requires: python2-six -%if 0%{?fedora} > 0 -Requires: python2-decorator -%else -Requires: python-decorator -%endif - -%description -n python2-%{pname} -%{common_desc} - -%if 0%{?with_python3} -%package -n python3-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python3-%{pname}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr - -# test dependencies -BuildRequires: python3-oslo-utils -BuildRequires: python3-openstackclient -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-log -BuildRequires: python3-osprofiler -BuildRequires: python3-stevedore -BuildRequires: python3-requests -BuildRequires: python3-oslo-i18n -BuildRequires: python3-fixtures -BuildRequires: python3-mock -BuildRequires: python3-testtools -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-prettytable - -Requires: python3-babel -Requires: python3-cryptography -Requires: python3-decorator -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-osc-lib >= 1.8.0 -Requires: python3-os-client-config >= 1.28.0 -Requires: python3-pbr -Requires: python3-prettytable -Requires: python3-six - -%description -n python3-%{pname} -%{common_desc} -%endif - -%package -n python-%{pname}-doc -Summary: python-magnumclient documentation -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-os-client-config -BuildRequires: openstack-macros -%if 0%{?fedora} > 0 -BuildRequires: python2-decorator -%else -BuildRequires: python-decorator -%endif - -%description -n python-%{pname}-doc -Documentation for python-magnumclient - -%package -n python2-%{pname}-tests -Summary: Python-magnumclient test subpackage -%{?python_provide:%python_provide python2-%{pname}-tests} - -Requires: python2-%{pname} = %{version}-%{release} -Requires: python2-oslo-utils -Requires: python2-stevedore -Requires: python2-requests -Requires: python2-oslo-i18n -Requires: python2-fixtures -Requires: python2-mock -Requires: python2-testtools -Requires: python2-keystoneauth1 -Requires: python2-prettytable - -%description -n python2-%{pname}-tests -%{common_desc_tests} - -%if 0%{?with_python3} -%package -n python3-%{pname}-tests -Summary: Python-magnumclient test subpackage - -Requires: python3-%{pname} = %{version}-%{release} -Requires: python3-oslo-utils -Requires: python3-stevedore -Requires: python3-requests -Requires: python3-oslo-i18n -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-testtools -Requires: python3-keystoneauth1 -Requires: python3-prettytable - -%description -n python3-%{pname}-tests -%{common_desc_tests} -%endif - -%prep -%autosetup -n %{name}-%{upstream_version} -S git - -# let RPM handle deps -%py_req_cleanup - -%build -export PBR_VERSION=%{version} -%py2_build -%py2_build_wheel - -%if 0%{?with_python3} -%py3_build -%endif -# generate html docs -# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a -# tagged release -sphinx-build -b html doc/source doc/build/html -# Fix hidden-file-or-dir warnings -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -export PBR_VERSION=%{version} -%if 0%{?with_python3} -%py3_install -%if %{default_python} >= 3 -mv %{buildroot}%{_bindir}/magnum ./magnum.py3 -%endif -%endif - -%py2_install - -%if 0%{?default_python} >= 3 -mv magnum.py3 %{buildroot}%{_bindir}/magnum -%endif - -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - -%check -# tests are failing due to unicode not defined -# we are skipping the test -%{__python2} setup.py test || -%if 0%{?with_python3} -%{__python3} setup.py test || -%endif - -%files -n python2-%{pname} -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{pname} -%if 0%{?default_python} <= 2 -%{_bindir}/magnum -%endif -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname} -%doc README.rst -%license LICENSE -%if 0%{?default_python} >= 3 -%{_bindir}/magnum -%endif -%{python3_sitelib}/magnumclient -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/%{pname}/tests -%endif - -%files -n python-%{pname}-doc -%license LICENSE -%doc doc/build/html - -%files -n python2-%{pname}-tests -%{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname}-tests -%{python3_sitelib}/%{pname}/tests -%endif - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* - -%changelog -* Thu Aug 09 2018 RDO 2.10.0-1 -- Update to 2.10.0 - diff --git a/openstack/python-magnumclient/centos/python-magnumclient.spec.orig b/openstack/python-magnumclient/centos/python-magnumclient.spec.orig deleted file mode 100644 index a20f9993..00000000 --- a/openstack/python-magnumclient/centos/python-magnumclient.spec.orig +++ /dev/null @@ -1,250 +0,0 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global sname python-magnumclient -%global pname magnumclient - -%if 0%{?fedora} >= 24 -%global with_python3 1 -%global default_python 3 -%else -%global default_python 2 -%endif - -%global common_desc \ -This is a client library for Magnum built on the Magnum API. \ -It provides a Python API (the magnumclient module) and a \ -command-line tool (magnum). - -%global common_desc_tests Python-magnumclient test subpackage - -Name: python-%{pname} -Version: 2.10.0 -Release: 1%{?dist} -Summary: Client library for Magnum API - -License: ASL 2.0 -URL: https://launchpad.net/python-magnumclient -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz -BuildArch: noarch - -%description -%{common_desc} - -%package -n python2-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python2-%{pname}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pbr -BuildRequires: git - -# test dependencies -BuildRequires: python2-oslo-utils -BuildRequires: python2-openstackclient -BuildRequires: python2-oslo-serialization -BuildRequires: python2-oslo-log -BuildRequires: python2-osprofiler -BuildRequires: python2-stevedore -BuildRequires: python2-requests -BuildRequires: python2-oslo-i18n -BuildRequires: python2-fixtures -BuildRequires: python2-mock -BuildRequires: python2-testtools -BuildRequires: python2-keystoneauth1 -BuildRequires: python2-prettytable - -Requires: python2-babel -Requires: python2-cryptography -Requires: python2-keystoneauth1 >= 3.4.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-osc-lib >= 1.8.0 -Requires: python2-os-client-config >= 1.28.0 -Requires: python2-pbr -Requires: python2-prettytable -Requires: python2-six -%if 0%{?fedora} > 0 -Requires: python2-decorator -%else -Requires: python-decorator -%endif - -%description -n python2-%{pname} -%{common_desc} - -%if 0%{?with_python3} -%package -n python3-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python3-%{pname}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr - -# test dependencies -BuildRequires: python3-oslo-utils -BuildRequires: python3-openstackclient -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-log -BuildRequires: python3-osprofiler -BuildRequires: python3-stevedore -BuildRequires: python3-requests -BuildRequires: python3-oslo-i18n -BuildRequires: python3-fixtures -BuildRequires: python3-mock -BuildRequires: python3-testtools -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-prettytable - -Requires: python3-babel -Requires: python3-cryptography -Requires: python3-decorator -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-osc-lib >= 1.8.0 -Requires: python3-os-client-config >= 1.28.0 -Requires: python3-pbr -Requires: python3-prettytable -Requires: python3-six - -%description -n python3-%{pname} -%{common_desc} -%endif - -%package -n python-%{pname}-doc -Summary: python-magnumclient documentation -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-os-client-config -BuildRequires: openstack-macros -%if 0%{?fedora} > 0 -BuildRequires: python2-decorator -%else -BuildRequires: python-decorator -%endif - -%description -n python-%{pname}-doc -Documentation for python-magnumclient - -%package -n python2-%{pname}-tests -Summary: Python-magnumclient test subpackage -%{?python_provide:%python_provide python2-%{pname}-tests} - -Requires: python2-%{pname} = %{version}-%{release} -Requires: python2-oslo-utils -Requires: python2-stevedore -Requires: python2-requests -Requires: python2-oslo-i18n -Requires: python2-fixtures -Requires: python2-mock -Requires: python2-testtools -Requires: python2-keystoneauth1 -Requires: python2-prettytable - -%description -n python2-%{pname}-tests -%{common_desc_tests} - -%if 0%{?with_python3} -%package -n python3-%{pname}-tests -Summary: Python-magnumclient test subpackage - -Requires: python3-%{pname} = %{version}-%{release} -Requires: python3-oslo-utils -Requires: python3-stevedore -Requires: python3-requests -Requires: python3-oslo-i18n -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-testtools -Requires: python3-keystoneauth1 -Requires: python3-prettytable - -%description -n python3-%{pname}-tests -%{common_desc_tests} -%endif - -%prep -%autosetup -n %{name}-%{upstream_version} -S git - -# let RPM handle deps -%py_req_cleanup - -%build -%py2_build - -%if 0%{?with_python3} -%py3_build -%endif -# generate html docs -# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a -# tagged release -sphinx-build -b html doc/source doc/build/html -# Fix hidden-file-or-dir warnings -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install - -%if 0%{?with_python3} -%py3_install -%if %{default_python} >= 3 -mv %{buildroot}%{_bindir}/magnum ./magnum.py3 -%endif -%endif - -%py2_install - -%if 0%{?default_python} >= 3 -mv magnum.py3 %{buildroot}%{_bindir}/magnum -%endif - -%check -# tests are failing due to unicode not defined -# we are skipping the test -%{__python2} setup.py test || -%if 0%{?with_python3} -%{__python3} setup.py test || -%endif - -%files -n python2-%{pname} -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{pname} -%if 0%{?default_python} <= 2 -%{_bindir}/magnum -%endif -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname} -%doc README.rst -%license LICENSE -%if 0%{?default_python} >= 3 -%{_bindir}/magnum -%endif -%{python3_sitelib}/magnumclient -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/%{pname}/tests -%endif - -%files -n python-%{pname}-doc -%license LICENSE -%doc doc/build/html - -%files -n python2-%{pname}-tests -%{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname}-tests -%{python3_sitelib}/%{pname}/tests -%endif - -%changelog -* Thu Aug 09 2018 RDO 2.10.0-1 -- Update to 2.10.0 - diff --git a/openstack/python-muranoclient/centos/build_srpm.data b/openstack/python-muranoclient/centos/build_srpm.data deleted file mode 100644 index aa475187..00000000 --- a/openstack/python-muranoclient/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -TAR_NAME="python-muranoclient" -SRC_DIR="$CGCS_BASE/git/python-muranoclient" -TIS_PATCH_VER=1 diff --git a/openstack/python-muranoclient/centos/python-muranoclient.spec b/openstack/python-muranoclient/centos/python-muranoclient.spec deleted file mode 100644 index 363e6f62..00000000 --- a/openstack/python-muranoclient/centos/python-muranoclient.spec +++ /dev/null @@ -1,202 +0,0 @@ -%global pypi_name muranoclient - -%if 0%{?fedora} -%global with_python3 0 -%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')} -%endif - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global common_desc \ -Client library for Murano built on the Murano API. It provides a Python \ -API (the muranoclient module) and a command-line tool (murano). - -Name: python-%{pypi_name} -Version: 1.1.1 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Client library for OpenStack Murano API - -License: ASL 2.0 -URL: http://pypi.python.org/pypi/%{name} -Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - -%description -%{common_desc} - -%package -n python2-%{pypi_name} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-wheel -BuildRequires: python2-pbr >= 2.0.0 - -Requires: python2-babel >= 2.3.4 -Requires: python2-glanceclient >= 1:2.8.0 -Requires: python2-iso8601 >= 0.1.11 -Requires: python2-keystoneclient >= 1:3.8.0 -Requires: python2-murano-pkg-check >= 0.3.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-prettytable >= 0.7.2 -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 -Requires: python2-yaql >= 1.1.3 -Requires: python2-osc-lib >= 1.10.0 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-pyOpenSSL >= 16.2.0 -%if 0%{?fedora} > 0 -Requires: python2-pyyaml >= 3.10 -%else -Requires: PyYAML >= 3.10 -%endif - -Summary: Client library for OpenStack Murano API. -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -%{common_desc} - -# Python3 package -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: Support of EC2 API for OpenStack -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python-tools - -Requires: python3-babel >= 2.3.4 -Requires: python3-glanceclient >= 1:2.8.0 -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-keystoneclient >= 1:3.8.0 -Requires: python3-murano-pkg-check >= 0.3.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable >= 0.7.2 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-yaql >= 1.1.3 -Requires: python3-osc-lib >= 1.10.0 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pyOpenSSL >= 16.2.0 -Requires: python3-PyYAML >= 3.10 - -%description -n python3-%{pypi_name} -%{common_desc} -%endif - -# Documentation package -%package -n python-%{pypi_name}-doc -Summary: Documentation for OpenStack Murano API Client - -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme - -%description -n python-%{pypi_name}-doc -Documentation for the client library for interacting with Openstack -Murano API. - -%prep -%autosetup -n %{name}-%{upstream_version} -S git -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info -# Let RPM handle the dependencies -%py_req_cleanup - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -2to3 --write --nobackups %{py3dir} -%endif - -%build -export PBR_VERSION=%{version} -%{__python2} setup.py build -%py2_build_wheel - -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py build -popd -%endif - -# generate html docs -export PYTHONPATH=. -sphinx-build -W -b html doc/source doc/build/html -# remove the sphinx-build leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -export PBR_VERSION=%{version} -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot} -mv %{buildroot}%{_bindir}/murano %{buildroot}%{_bindir}/python3-murano -popd -%endif - -%{__python2} setup.py install --skip-build --root %{buildroot} - -# rename binaries, make compat symlinks -pushd %{buildroot}%{_bindir} -%if 0%{?with_python3} -for i in %{pypi_name}-{3,%{?python3_shortver}}; do - ln -s python3-%{pypi_name} $i -done -%endif -popd - -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - - -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info -%{_bindir}/murano* - -# Files for python3 -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%license LICENSE -%doc README.rst -%{_bindir}/python3-murano -%{_bindir}/murano* -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/python_%{pypi_name}-%{version}-py?.?.egg-info -%endif - -%files -n python-%{pypi_name}-doc -%doc doc/build/html -%license LICENSE - - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* - - - -%changelog -* Thu Aug 16 2018 RDO 1.1.1-1 -- Update to 1.1.1 - diff --git a/openstack/python-muranoclient/centos/python-muranoclient.spec.orig b/openstack/python-muranoclient/centos/python-muranoclient.spec.orig deleted file mode 100644 index 7addcb9e..00000000 --- a/openstack/python-muranoclient/centos/python-muranoclient.spec.orig +++ /dev/null @@ -1,182 +0,0 @@ -%global pypi_name muranoclient - -%if 0%{?fedora} -%global with_python3 0 -%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')} -%endif - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global common_desc \ -Client library for Murano built on the Murano API. It provides a Python \ -API (the muranoclient module) and a command-line tool (murano). - -Name: python-%{pypi_name} -Version: 1.1.1 -Release: 1%{?dist} -Summary: Client library for OpenStack Murano API - -License: ASL 2.0 -URL: http://pypi.python.org/pypi/%{name} -Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - -%description -%{common_desc} - -%package -n python2-%{pypi_name} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pbr >= 2.0.0 - -Requires: python2-babel >= 2.3.4 -Requires: python2-glanceclient >= 1:2.8.0 -Requires: python2-iso8601 >= 0.1.11 -Requires: python2-keystoneclient >= 1:3.8.0 -Requires: python2-murano-pkg-check >= 0.3.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-prettytable >= 0.7.2 -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 -Requires: python2-yaql >= 1.1.3 -Requires: python2-osc-lib >= 1.10.0 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-pyOpenSSL >= 16.2.0 -%if 0%{?fedora} > 0 -Requires: python2-pyyaml >= 3.10 -%else -Requires: PyYAML >= 3.10 -%endif - -Summary: Client library for OpenStack Murano API. -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -%{common_desc} - -# Python3 package -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: Support of EC2 API for OpenStack -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python-tools - -Requires: python3-babel >= 2.3.4 -Requires: python3-glanceclient >= 1:2.8.0 -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-keystoneclient >= 1:3.8.0 -Requires: python3-murano-pkg-check >= 0.3.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable >= 0.7.2 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-yaql >= 1.1.3 -Requires: python3-osc-lib >= 1.10.0 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pyOpenSSL >= 16.2.0 -Requires: python3-PyYAML >= 3.10 - -%description -n python3-%{pypi_name} -%{common_desc} -%endif - -# Documentation package -%package -n python-%{pypi_name}-doc -Summary: Documentation for OpenStack Murano API Client - -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme - -%description -n python-%{pypi_name}-doc -Documentation for the client library for interacting with Openstack -Murano API. - -%prep -%autosetup -n %{name}-%{upstream_version} -S git -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info -# Let RPM handle the dependencies -%py_req_cleanup - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -2to3 --write --nobackups %{py3dir} -%endif - -%build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py build -popd -%endif - -# generate html docs -export PYTHONPATH=. -sphinx-build -W -b html doc/source doc/build/html -# remove the sphinx-build leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot} -mv %{buildroot}%{_bindir}/murano %{buildroot}%{_bindir}/python3-murano -popd -%endif - -%{__python2} setup.py install --skip-build --root %{buildroot} - -# rename binaries, make compat symlinks -pushd %{buildroot}%{_bindir} -%if 0%{?with_python3} -for i in %{pypi_name}-{3,%{?python3_shortver}}; do - ln -s python3-%{pypi_name} $i -done -%endif -popd - -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info -%{_bindir}/murano* - -# Files for python3 -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%license LICENSE -%doc README.rst -%{_bindir}/python3-murano -%{_bindir}/murano* -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/python_%{pypi_name}-%{version}-py?.?.egg-info -%endif - -%files -n python-%{pypi_name}-doc -%doc doc/build/html -%license LICENSE - -%changelog -* Thu Aug 16 2018 RDO 1.1.1-1 -- Update to 1.1.1 - diff --git a/openstack/python-neutronclient/centos/build_srpm.data b/openstack/python-neutronclient/centos/build_srpm.data index 94ef6291..63ceaddc 100644 --- a/openstack/python-neutronclient/centos/build_srpm.data +++ b/openstack/python-neutronclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-neutronclient SRC_DIR="$CGCS_BASE/git/python-neutronclient" -TIS_BASE_SRCREV="6.12.0" +TIS_BASE_SRCREV="6.14.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-neutronclient/centos/python-neutronclient.spec b/openstack/python-neutronclient/centos/python-neutronclient.spec index 53e8219a..07bd1804 100644 --- a/openstack/python-neutronclient/centos/python-neutronclient.spec +++ b/openstack/python-neutronclient/centos/python-neutronclient.spec @@ -11,7 +11,7 @@ Client library and command line utility for interacting with OpenStack \ Neutron's API. Name: python-neutronclient -Version: 6.12.0 +Version: 6.14.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Neutron @@ -43,6 +43,7 @@ BuildRequires: python2-oslotest BuildRequires: python2-testtools BuildRequires: python2-testrepository BuildRequires: python2-testscenarios +BuildRequires: python2-oslo-log >= 3.36.0 Requires: python2-babel >= 2.3.4 Requires: python2-iso8601 >= 0.1.11 diff --git a/openstack/python-novaclient/centos/build_srpm.data b/openstack/python-novaclient/centos/build_srpm.data index 552da58a..0b4fcf5d 100644 --- a/openstack/python-novaclient/centos/build_srpm.data +++ b/openstack/python-novaclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-novaclient SRC_DIR=$CGCS_BASE/git/python-novaclient -TIS_BASE_SRCREV="13.0.0" +TIS_BASE_SRCREV="15.1.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-novaclient/centos/python-novaclient.spec b/openstack/python-novaclient/centos/python-novaclient.spec index 346c5c60..0d8adb49 100644 --- a/openstack/python-novaclient/centos/python-novaclient.spec +++ b/openstack/python-novaclient/centos/python-novaclient.spec @@ -14,7 +14,7 @@ the OpenStack Nova API. Name: python-novaclient Epoch: 1 -Version: 13.0.0 +Version: 15.1.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Nova License: ASL 2.0 diff --git a/openstack/python-openstackclient/centos/build_srpm.data b/openstack/python-openstackclient/centos/build_srpm.data index df27d25b..32da9a1d 100644 --- a/openstack/python-openstackclient/centos/build_srpm.data +++ b/openstack/python-openstackclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=python-openstackclient SRC_DIR="$CGCS_BASE/git/python-openstackclient" -TIS_BASE_SRCREV="3.18.0" +TIS_BASE_SRCREV="4.0.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-openstackclient/centos/python-openstackclient.spec b/openstack/python-openstackclient/centos/python-openstackclient.spec index 550c2fca..9967ae12 100644 --- a/openstack/python-openstackclient/centos/python-openstackclient.spec +++ b/openstack/python-openstackclient/centos/python-openstackclient.spec @@ -16,7 +16,7 @@ It is a thin wrapper to the stock python-*client modules that implement the \ actual REST API client actions. Name: python-openstackclient -Version: 3.18.0 +Version: 4.0.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: OpenStack Command-line Client @@ -76,17 +76,17 @@ BuildRequires: python2-osprofiler Requires: python2-pbr Requires: python2-babel -Requires: python2-openstacksdk >= 0.11.2 +Requires: python2-openstacksdk >= 0.17.0 Requires: python2-oslo-i18n >= 3.15.3 Requires: python2-oslo-utils >= 3.33.0 Requires: python2-glanceclient >= 1:2.8.0 -Requires: python2-keystoneauth1 >= 3.4.0 +Requires: python2-keystoneauth1 >= 3.6.2 Requires: python2-keystoneclient >= 1:3.17.0 -Requires: python2-novaclient >= 9.1.0 +Requires: python2-novaclient >= 15.0.0 Requires: python2-cinderclient >= 3.3.0 Requires: python2-neutronclient >= 6.7.0 Requires: python2-six >= 1.10.0 -Requires: python2-osc-lib >= 1.10.0 +Requires: python2-osc-lib >= 1.14.0 %if 0%{?fedora} > 0 Requires: python2-cliff %else @@ -159,17 +159,17 @@ BuildRequires: python3-osprofiler Requires: python3-pbr Requires: python3-babel Requires: python3-cliff -Requires: python3-openstacksdk >= 0.11.2 +Requires: python3-openstacksdk >= 0.17.0 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-oslo-utils >= 3.33.0 Requires: python3-glanceclient >= 1:2.8.0 -Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-keystoneauth1 >= 3.6.2 Requires: python3-keystoneclient >= 1:3.17.0 -Requires: python3-novaclient >= 9.1.0 +Requires: python3-novaclient >= 15.0.0 Requires: python3-cinderclient >= 3.3.0 Requires: python3-neutronclient >= 6.7.0 Requires: python3-six >= 1.10.0 -Requires: python3-osc-lib >= 1.10.0 +Requires: python3-osc-lib >= 1.14.0 Requires: python-%{client}-lang = %{version}-%{release} %description -n python3-%{client} diff --git a/openstack/python-openstacksdk/centos/build_srpm.data b/openstack/python-openstacksdk/centos/build_srpm.data index 6ad7c9d5..819bf032 100644 --- a/openstack/python-openstacksdk/centos/build_srpm.data +++ b/openstack/python-openstacksdk/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=openstacksdk SRC_DIR="$CGCS_BASE/git/python-openstacksdk" -TIS_BASE_SRCREV="0.25.0" +TIS_BASE_SRCREV="0.36.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-openstacksdk/centos/python-openstacksdk.spec b/openstack/python-openstacksdk/centos/python-openstacksdk.spec index af47a781..7cf902ac 100644 --- a/openstack/python-openstacksdk/centos/python-openstacksdk.spec +++ b/openstack/python-openstacksdk/centos/python-openstacksdk.spec @@ -20,7 +20,7 @@ A collection of libraries for building applications to work with OpenStack \ clouds - test files Name: python-%{pypi_name} -Version: 0.25.0 +Version: 0.36.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: An SDK for building applications to work with OpenStack diff --git a/openstack/python-pankoclient/centos/build_srpm.data b/openstack/python-pankoclient/centos/build_srpm.data index 328b34a8..6c6675a5 100644 --- a/openstack/python-pankoclient/centos/build_srpm.data +++ b/openstack/python-pankoclient/centos/build_srpm.data @@ -1,4 +1,4 @@ TAR_NAME=pankoclient SRC_DIR=$CGCS_BASE/git/python-pankoclient -TIS_BASE_SRCREV="0.5.0" +TIS_BASE_SRCREV="0.7.0" TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/python-pankoclient/centos/python-pankoclient.spec b/openstack/python-pankoclient/centos/python-pankoclient.spec index 64a03932..95a32999 100644 --- a/openstack/python-pankoclient/centos/python-pankoclient.spec +++ b/openstack/python-pankoclient/centos/python-pankoclient.spec @@ -10,7 +10,7 @@ %endif Name: python-pankoclient -Version: 0.5.0 +Version: 0.7.0 Release: 1%{?_tis_dist}.%{tis_patch_ver} Summary: Python API and CLI for OpenStack Panko @@ -39,6 +39,7 @@ Requires: python-osc-lib >= 1.2.0 Requires: python-oslo-i18n >= 2.1.0 Requires: python-oslo-serialization >= 1.10.0 Requires: python-oslo-utils >= 3.18.0 +Requires: python-osprofiler >= 1.4.0 Requires: python-pbr Requires: python-requests Requires: python-six >= 1.9.0 @@ -93,6 +94,7 @@ Requires: python3-osc-lib >= 1.2.0 Requires: python3-oslo-i18n >= 2.1.0 Requires: python3-oslo-serialization >= 1.10.0 Requires: python3-oslo-utils >= 3.18.0 +Requires: python3-osprofiler >= 1.4.0 Requires: python3-pbr Requires: python3-requests Requires: python3-six >= 1.9.0