[PATCH 03/16] stx-upstream: upgrade keystoneclient for Train
python-keystoneclient version: 3.21 Story: 2007502 Task: 39252 Depends-on: https://review.opendev.org/#/c/716818 Change-Id: I46522cd4dd279c0e73925e9f9e4b90e65aa8d86c Signed-off-by: Chen, Yan <yan.chen@intel.com>
This commit is contained in:
Chen, Yan
parent
b38e8f2ba0
commit
3d3a2c80de
|
|
@ -1,5 +1,5 @@
|
||||||
TAR_NAME=python-keystoneclient
|
TAR_NAME=python-keystoneclient
|
||||||
SRC_DIR=$CGCS_BASE/git/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
|
TIS_PATCH_VER=GITREVCOUNT
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,27 @@
|
||||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
# Macros for py2/py3 compatibility
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
%if 0%{?fedora}
|
%global pyver %{python3_pkgversion}
|
||||||
%global with_python3 1
|
%else
|
||||||
|
%global pyver 2
|
||||||
%endif
|
%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 \
|
%global common_desc \
|
||||||
Client library and command line utility for interacting with Openstack \
|
Client library and command line utility for interacting with Openstack \
|
||||||
Identity API.
|
Identity API.
|
||||||
|
|
||||||
|
%global sname keystoneclient
|
||||||
|
%global with_doc 1
|
||||||
|
|
||||||
Name: python-keystoneclient
|
Name: python-keystoneclient
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 3.19.0
|
Version: 3.21.0
|
||||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
Release: 2%{?_tis_dist}.%{tis_patch_ver}
|
||||||
Summary: Client library for OpenStack Identity API
|
Summary: Client library for OpenStack Identity API
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://launchpad.net/python-keystoneclient
|
URL: https://launchpad.net/python-keystoneclient
|
||||||
|
|
@ -25,158 +35,97 @@ BuildRequires: /usr/bin/openssl
|
||||||
%description
|
%description
|
||||||
%{common_desc}
|
%{common_desc}
|
||||||
|
|
||||||
%package -n python2-keystoneclient
|
%package -n python%{pyver}-%{sname}
|
||||||
Summary: Client library for OpenStack Identity API
|
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: python%{pyver}-devel
|
||||||
BuildRequires: python2-setuptools
|
BuildRequires: python%{pyver}-setuptools
|
||||||
BuildRequires: python2-pip
|
BuildRequires: python%{pyver}-pbr >= 2.0.0
|
||||||
BuildRequires: python2-wheel
|
|
||||||
BuildRequires: python2-pbr >= 2.0.0
|
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
|
|
||||||
Requires: python2-oslo-config >= 2:5.2.0
|
Requires: python%{pyver}-oslo-config >= 2:5.2.0
|
||||||
Requires: python2-oslo-i18n >= 3.15.3
|
Requires: python%{pyver}-oslo-i18n >= 3.15.3
|
||||||
Requires: python2-oslo-serialization >= 2.18.0
|
Requires: python%{pyver}-oslo-serialization >= 2.18.0
|
||||||
Requires: python2-oslo-utils >= 3.33.0
|
Requires: python%{pyver}-oslo-utils >= 3.33.0
|
||||||
Requires: python2-requests >= 2.14.2
|
Requires: python%{pyver}-requests >= 2.14.2
|
||||||
Requires: python2-six >= 1.10.0
|
Requires: python%{pyver}-six >= 1.10.0
|
||||||
Requires: python2-stevedore >= 1.20.0
|
Requires: python%{pyver}-stevedore >= 1.20.0
|
||||||
Requires: python2-pbr >= 2.0.0
|
Requires: python%{pyver}-pbr >= 2.0.0
|
||||||
Requires: python2-debtcollector >= 1.2.0
|
Requires: python%{pyver}-debtcollector >= 1.2.0
|
||||||
Requires: python2-keystoneauth1 >= 3.4.0
|
Requires: python%{pyver}-keystoneauth1 >= 3.4.0
|
||||||
%if 0%{?fedora} > 0
|
# Handle python2 exception
|
||||||
Requires: python2-keyring >= 5.5.1
|
%if %{pyver} == 2
|
||||||
%else
|
|
||||||
Requires: python-keyring >= 5.5.1
|
Requires: python-keyring >= 5.5.1
|
||||||
|
%else
|
||||||
|
Requires: python%{pyver}-keyring >= 5.5.1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description -n python2-keystoneclient
|
%description -n python%{pyver}-%{sname}
|
||||||
%{common_desc}
|
%{common_desc}
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%package -n python%{pyver}-%{sname}-tests
|
||||||
%package -n python3-keystoneclient
|
Summary: Python API and CLI for OpenStack Keystone (tests)
|
||||||
Summary: Client library for OpenStack Identity API
|
%{?python_provide:%python_provide python%{pyver}-%{sname}-tests}
|
||||||
%{?python_provide:%python_provide python3-keystoneclient}
|
Requires: python%{pyver}-%{sname} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python%{pyver}-hacking
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python%{pyver}-fixtures
|
||||||
BuildRequires: python3-pbr >= 2.0.0
|
BuildRequires: python%{pyver}-mock
|
||||||
|
BuildRequires: python%{pyver}-oauthlib
|
||||||
Requires: python3-oslo-config >= 2:5.2.0
|
BuildRequires: python%{pyver}-oslotest
|
||||||
Requires: python3-oslo-i18n >= 3.15.3
|
BuildRequires: python%{pyver}-testtools
|
||||||
Requires: python3-oslo-serialization >= 2.18.0
|
BuildRequires: python%{pyver}-keystoneauth1
|
||||||
Requires: python3-oslo-utils >= 3.33.0
|
BuildRequires: python%{pyver}-oslo-config
|
||||||
Requires: python3-requests >= 2.14.2
|
BuildRequires: python%{pyver}-oslo-utils
|
||||||
Requires: python3-six >= 1.10.0
|
BuildRequires: python%{pyver}-oslo-serialization
|
||||||
Requires: python3-stevedore >= 1.20.0
|
BuildRequires: python%{pyver}-oslo-i18n
|
||||||
Requires: python3-pbr >= 2.0.0
|
BuildRequires: python%{pyver}-stestr
|
||||||
Requires: python3-debtcollector >= 1.2.0
|
BuildRequires: python%{pyver}-testresources
|
||||||
Requires: python3-keystoneauth1 >= 3.4.0
|
BuildRequires: python%{pyver}-testscenarios
|
||||||
Requires: python3-keyring >= 5.5.1
|
BuildRequires: python%{pyver}-requests-mock
|
||||||
|
# Handle python2 exception
|
||||||
%description -n python3-keystoneclient
|
%if %{pyver} == 2
|
||||||
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-keyring >= 5.5.1
|
||||||
BuildRequires: python-lxml
|
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
|
%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-lxml
|
||||||
Requires: python-requests-mock
|
%else
|
||||||
|
Requires: python%{pyver}-lxml
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%description -n python%{pyver}-%{sname}-tests
|
||||||
|
{common_desc}
|
||||||
|
|
||||||
%description -n python2-keystoneclient-tests
|
%if 0%{?with_doc}
|
||||||
python2-keystoneclient test subpackages
|
%package -n python-%{sname}-doc
|
||||||
|
|
||||||
%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
|
Summary: Documentation for OpenStack Keystone API client
|
||||||
|
|
||||||
BuildRequires: python2-sphinx
|
BuildRequires: python%{pyver}-sphinx
|
||||||
BuildRequires: python2-openstackdocstheme
|
BuildRequires: python%{pyver}-openstackdocstheme
|
||||||
|
|
||||||
%description doc
|
%description -n python-%{sname}-doc
|
||||||
Documentation for the keystoneclient module
|
{common_desc}
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{upstream_version} -S git
|
%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
|
rm -rf {test-,}requirements.txt
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PBR_VERSION=%{version}
|
%{pyver_build}
|
||||||
%py2_build
|
|
||||||
%py2_build_wheel
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
%py3_build
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
export PBR_VERSION=%{version}
|
%{pyver_install}
|
||||||
%py2_install
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
%py3_install
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
%if 0%{?with_doc}
|
||||||
# Build HTML docs
|
# Build HTML docs
|
||||||
%{__python2} setup.py build_sphinx -b html
|
%{pyver_bin} setup.py build_sphinx -b html
|
||||||
# Fix hidden-file-or-dir warnings
|
# Fix hidden-file-or-dir warnings
|
||||||
rm -fr doc/build/html/.{doctrees,buildinfo}
|
rm -fr doc/build/html/.{doctrees,buildinfo}
|
||||||
|
%endif
|
||||||
# STX: stage wheels
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
|
||||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
|
||||||
|
|
||||||
#%check
|
#%check
|
||||||
#stestr --test-path=./keystoneclient/tests/unit run
|
#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
|
#stestr-3 --test-path=./keystoneclient/tests/unit run
|
||||||
#%endif
|
#%endif
|
||||||
|
|
||||||
%files -n python2-keystoneclient
|
%files -n python%{pyver}-%{sname}
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%{python2_sitelib}/keystoneclient
|
%{pyver_sitelib}/%{sname}
|
||||||
%{python2_sitelib}/*.egg-info
|
%{pyver_sitelib}/*.egg-info
|
||||||
%exclude %{python2_sitelib}/keystoneclient/tests
|
%exclude %{pyver_sitelib}/%{sname}/tests
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_doc}
|
||||||
%files -n python3-keystoneclient
|
%files -n python-%{sname}-doc
|
||||||
%license LICENSE
|
|
||||||
%doc README.rst
|
|
||||||
%{python3_sitelib}/keystoneclient
|
|
||||||
%{python3_sitelib}/*.egg-info
|
|
||||||
%exclude %{python3_sitelib}/keystoneclient/tests
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files doc
|
|
||||||
%doc doc/build/html
|
%doc doc/build/html
|
||||||
%license LICENSE
|
%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
|
%endif
|
||||||
|
|
||||||
|
%files -n python%{pyver}-%{sname}-tests
|
||||||
%package wheels
|
%license LICENSE
|
||||||
Summary: %{name} wheels
|
%{pyver_sitelib}/%{sname}/tests
|
||||||
|
|
||||||
%description wheels
|
|
||||||
Contains python wheels for %{name}
|
|
||||||
|
|
||||||
%files wheels
|
|
||||||
/wheels/*
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 1:3.17.0-1
|
* Thu Oct 03 2019 Joel Capitao <jcapitao@redhat.com> 1:3.21.0-2
|
||||||
- Update to 3.17.0
|
- Removed python2 subpackages in no el7 distros
|
||||||
|
|
||||||
|
* Thu Sep 19 2019 RDO <dev@lists.rdoproject.org> 1:3.21.0-1
|
||||||
|
- Update to 3.21.0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 <dev@lists.rdoproject.org> 1:3.17.0-1
|
||||||
|
- Update to 3.17.0
|
||||||
|
|
||||||
Loading…
Reference in New Issue