From aa53432df7097c6339ec766fb8843d080e390f0b Mon Sep 17 00:00:00 2001 From: "Chen, Yan" Date: Fri, 20 Dec 2019 05:25:37 +0000 Subject: [PATCH] [PATCH 01/16] stx-upstream: upgrade keystoneauth1 to Train. Current Version: 3.17.1 Story: 2007502 Task: 39250 Depends-on: https://review.opendev.org/#/c/716818 Change-Id: I5662d17b1c030790b86ed9c4a8a947fcf50c6617 Signed-off-by: Chen, Yan --- .../centos/build_srpm.data | 2 +- .../centos/python-keystoneauth1.spec | 199 ++++++++---------- 2 files changed, 83 insertions(+), 118 deletions(-) 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