openstack/rpm-packaging
Code Issues Proposed changes

keystonemiddleware: convert to python3

Browse Source 
Change-Id: I45e9fb6e25bae5cbbad7aeecf0d22f7ca873b78e
This commit is contained in:
Javier Pena
2020-01-15 11:10:54 +01:00
parent d17869e6e2
commit d16131929e
1 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
openstack/keystonemiddleware/keystonemiddleware.spec.j2
View File

@@ -12,47 +12,31 @@ Group: Development/Languages/Python
URL: https://launchpad.net/{{ pypi_name }}
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('WebOb', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('WebTest', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('cryptography', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('keystoneauth1', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('python-keystoneclient', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.cache', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.config', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.context', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.messaging', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.serialization', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('pycadf', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('python-memcached', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('requests', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stevedore', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testresources', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('WebOb') }}
Requires: {{ py2pkg('keystoneauth1') }}
Requires: {{ py2pkg('python-keystoneclient') }}
Requires: {{ py2pkg('oslo.cache') }}
Requires: {{ py2pkg('oslo.config') }}
Requires: {{ py2pkg('oslo.context') }}
Requires: {{ py2pkg('oslo.i18n') }}
Requires: {{ py2pkg('oslo.log') }}
Requires: {{ py2pkg('oslo.messaging') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('oslo.utils') }}
Requires: {{ py2pkg('pycadf') }}
Requires: {{ py2pkg('python-memcached') }}
Requires: {{ py2pkg('requests') }}
Requires: {{ py2pkg('six') }}
BuildRequires: {{ py3('WebOb') }}
BuildRequires: {{ py3('WebTest') }}
BuildRequires: {{ py3('cryptography') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.cache') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.context') }}
BuildRequires: {{ py3('oslo.i18n') }}
BuildRequires: {{ py3('oslo.messaging') }}
BuildRequires: {{ py3('oslo.serialization') }}
BuildRequires: {{ py3('oslo.utils') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('pycadf') }}
BuildRequires: {{ py3('python-memcached') }}
BuildRequires: {{ py3('requests') }}
BuildRequires: {{ py3('requests-mock') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('stevedore') }}
BuildRequires: {{ py3('testresources') }}
BuildRequires: {{ py3('testtools') }}
BuildArch: noarch
%python_subpackages
%description
This package contains middleware modules designed to provide authentication
@@ -60,6 +44,32 @@ and authorization features to web services other than Keystone
The most prominent module is keystonemiddleware.auth_token. This package
does not expose any CLI or Python API features.
%package -n python3-keystonemiddleware
Summary: Middleware for OpenStack Identity
Requires: {{ py3('WebOb') }}
Requires: {{ py3('keystoneauth1') }}
Requires: {{ py3('python-keystoneclient') }}
Requires: {{ py3('oslo.cache') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('oslo.context') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.messaging') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('pycadf') }}
Requires: {{ py3('python-memcached') }}
Requires: {{ py3('requests') }}
Requires: {{ py3('six') }}
%description -n python3-keystonemiddleware
This package contains middleware modules designed to provide authentication
and authorization features to web services other than Keystone
The most prominent module is keystonemiddleware.auth_token. This package
does not expose any CLI or Python API features.
This package contains the Python 3.x module
%package -n {{ py2name('keystonemiddleware') }}-doc
Summary: Documentation for Middleware for OpenStack Identity
BuildRequires: {{ py3('Sphinx') }}
@@ -74,10 +84,10 @@ Documentation for Middleware for OpenStack Identity.
%py_req_cleanup
%build
%{python_build}
%{py3_build}
%install
%{python_install}
%{py3_install}
# generate html docs
export PYTHONPATH=.
@@ -86,13 +96,13 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%check
%python_exec -m stestr.cli run
python3 -m stestr.cli run
%files %python_files
%files -n python3-keystonemiddleware
%license LICENSE
%doc ChangeLog README.rst
%{python_sitelib}/{{ pypi_name }}
%{python_sitelib}/*.egg-info
%{python3_sitelib}/{{ pypi_name }}
%{python3_sitelib}/*.egg-info
%files -n {{ py2name('keystonemiddleware') }}-doc
%doc doc/build/html