diff --git a/.gitignore b/.gitignore index f2e28a9..05a9b72 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ /keystoneauth1-5.1.2.tar.gz /0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt /keystoneauth1-5.1.2.tar.gz.asc +/keystoneauth1-5.3.0.tar.gz +/0x815afec729392386480e076dcc0dfe2d21c023c9.txt +/keystoneauth1-5.3.0.tar.gz.asc diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec index b8b74be..69d5ba4 100644 --- a/python-keystoneauth1.spec +++ b/python-keystoneauth1.spec @@ -1,5 +1,5 @@ %{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} } -%global sources_gpg_sign 0xa7475c5f2122fec3f90343223fe3bf5aad1080e4 +%global sources_gpg_sign 0x815afec729392386480e076dcc0dfe2d21c023c9 %global pypi_name keystoneauth1 %global common_desc \ @@ -11,12 +11,14 @@ new clients. %global with_doc 1 %{!?upstream_version: %global upstream_version %{version}%{?milestone}} +# we are excluding some BRs from automatic generator +%global excluded_brs doc8 bandit pre-commit hacking flake8-import-order flake8-docstrings Name: python-%{pypi_name} -Version: 5.1.2 -Release: 3%{?dist} +Version: 5.3.0 +Release: 1%{?dist} Summary: Authentication Library for OpenStack Clients -License: ASL 2.0 +License: Apache-2.0 URL: https://pypi.io/pypi/%{pypi_name} Source0: https://tarballs.openstack.org/keystoneauth/keystoneauth1-%{upstream_version}.tar.gz # Required for tarball sources verification @@ -37,40 +39,11 @@ BuildRequires: /usr/bin/gpgv2 %package -n python3-%{pypi_name} Summary: Authentication Libarary for OpenStack Identity -%{?python_provide:%python_provide python3-%{pypi_name}} %{?python_provide:%python_provide python3-keystoneauth} BuildRequires: git-core BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-six -BuildRequires: python3-pbr >= 2.0.0 - -# test requires -BuildRequires: python3-betamax >= 0.7.0 -BuildRequires: python3-fixtures >= 1.3.1 -BuildRequires: python3-mock -BuildRequires: python3-oslotest -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-utils -BuildRequires: python3-stestr -BuildRequires: python3-oauthlib -BuildRequires: python3-requests -BuildRequires: python3-os-service-types -BuildRequires: python3-stevedore -BuildRequires: python3-iso8601 -BuildRequires: python3-requests-mock >= 1.1 - -BuildRequires: python3-PyYAML -BuildRequires: python3-lxml -BuildRequires: python3-requests-kerberos - -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-os-service-types >= 1.2.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six => 1.10.0 -Requires: python3-stevedore >= 1.20.0 +BuildRequires: pyproject-rpm-macros %description -n python3-%{pypi_name} %{common_desc} @@ -79,10 +52,6 @@ Requires: python3-stevedore >= 1.20.0 %package -n python-%{pypi_name}-doc Summary: Documentation for OpenStack Identity Authentication Library -BuildRequires: python3-sphinx -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-openstackdocstheme - %description -n python-%{pypi_name}-doc Documentation for OpenStack Identity Authentication Library %endif @@ -97,37 +66,58 @@ Documentation for OpenStack Identity Authentication Library sed -i '/sphinx.ext.intersphinx.*$/d' doc/source/conf.py -# Let RPM handle the dependencies -rm -rf {test-,}requirements.txt # Remove bundled egg-info rm -rf %{pypi_name}.egg-info # remove syntax tests rm keystoneauth1/tests/unit/test_hacking_checks.py +sed -i /.*-c{env:TOX_CONSTRAINTS_FILE.*/d tox.ini +sed -i /^minversion.*/d tox.ini +sed -i /^requires.*virtualenv.*/d tox.ini +sed -i '/sphinx-build/ s/-W//' tox.ini + +# Exclude some bad-known BRs +for pkg in %{excluded_brs};do + for reqfile in doc/requirements.txt test-requirements.txt; do + if [ -f $reqfile ]; then + sed -i /^${pkg}.*/d $reqfile + fi + done +done + +# Automatic BR generation +%generate_buildrequires +%if 0%{?with_doc} + %pyproject_buildrequires -t -e %{default_toxenv},docs +%else + %pyproject_buildrequires -t -e %{default_toxenv} +%endif + + %build -%{py3_build} +%pyproject_wheel %install -%{py3_install} +%pyproject_install %if 0%{?with_doc} # generate html docs 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-3 -b html -d doc/build/doctrees doc/source doc/build/html +%tox -e docs rm -rf doc/build/html/.buildinfo %endif %check -PYTHON=%{__python3} stestr-3 run +%tox -e %{default_toxenv} %files -n python3-%{pypi_name} %doc README.rst %license LICENSE %{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/*.egg-info +%{python3_sitelib}/*.dist-info %if 0%{?with_doc} %files -n python-%{pypi_name}-doc @@ -136,6 +126,9 @@ PYTHON=%{__python3} stestr-3 run %endif %changelog +* Thu Oct 26 2023 Alfredo Moralejo 5.3.0-1 +- Update to upstream version 5.3.0 + * Fri Jul 21 2023 Fedora Release Engineering - 5.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 7739685..fcc4feb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (keystoneauth1-5.1.2.tar.gz) = ff7e08114cc76d648c3879f44bb78b51e906fed2d34a9cf3e42199f1c5fc53394ad7b53f6cdfcb336436c482755d54891666369a0832ef9b846dd33dc4821791 -SHA512 (0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt) = cc8731a0fbdf791e51887609d13ee0ba402528572ab075419be998e29510211a6423fdfabc694eef8b654403d43cdcfc6b06ee244df58c5c4abc3e77ce85da24 -SHA512 (keystoneauth1-5.1.2.tar.gz.asc) = 72aa36ec5e008265d09b5a76659448cf3e81971b0b855b5c9f19271c40df558cde5280b5d2b113c50dacb404727fc11d361f95f3948eef637c969e87f41150b8 +SHA512 (keystoneauth1-5.3.0.tar.gz) = 91a9f9359926932a2e78a9164f8a1f2d08da306cc83f011f9a19535795b6a7faa3af0673665444532893325a2fe752f1d6a18e04b84ea1b3db8c9d1647b4f3cb +SHA512 (0x815afec729392386480e076dcc0dfe2d21c023c9.txt) = be660eacaae93572475d0ae4e9cc29fc90897ec8a2ca8f4d0c5c7dcf682de9933e71a811f82b067fe5cb92de90165099ad7b49be98a6082c733a7f6b5b5f5a77 +SHA512 (keystoneauth1-5.3.0.tar.gz.asc) = 7b3951e412dfb33271da7e648c2d46fbbdb64eeeba25ed2a431f29bc0aa41252296b897b0e0a729fc1559c53fde1a907230ede59d0311998a10b1c4ba3aa71e2