From 69ac4e0080e86dcba316635f30c1e4ea7863d44c Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Oct 25 2023 13:14:06 +0000 Subject: Sync from RDO bobcat release from python-novaclient-18.4.0-1.el9s --- diff --git a/.gitignore b/.gitignore index 45894d4..bc65455 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ /python-novaclient-18.3.0.tar.gz /0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt /python-novaclient-18.3.0.tar.gz.asc +/python-novaclient-18.4.0.tar.gz +/0x815afec729392386480e076dcc0dfe2d21c023c9.txt +/python-novaclient-18.4.0.tar.gz.asc diff --git a/python-novaclient.spec b/python-novaclient.spec index c9bc2c3..2582947 100644 --- a/python-novaclient.spec +++ b/python-novaclient.spec @@ -1,6 +1,12 @@ %{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} } -%global sources_gpg_sign 0xa7475c5f2122fec3f90343223fe3bf5aad1080e4 +%global sources_gpg_sign 0x815afec729392386480e076dcc0dfe2d21c023c9 %{!?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 whereto tempest osprofiler +# Exclude sphinx from BRs if docs are disabled +%if ! 0%{?with_doc} +%global excluded_brs %{excluded_brs} sphinx openstackdocstheme +%endif %global sname novaclient %global with_doc 1 @@ -12,10 +18,10 @@ the OpenStack Nova API. Name: python-novaclient Epoch: 1 -Version: 18.3.0 -Release: 3%{?dist} +Version: 18.4.0 +Release: 1%{?dist} Summary: Python API and CLI for OpenStack Nova -License: ASL 2.0 +License: Apache-2.0 URL: https://launchpad.net/%{name} Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.tar.gz # Required for tarball sources verification @@ -38,21 +44,9 @@ BuildRequires: git-core %package -n python3-%{sname} Summary: Python API and CLI for OpenStack Nova -%{?python_provide:%python_provide python3-novaclient} -Obsoletes: python2-%{sname} < %{version}-%{release} BuildRequires: python3-devel -BuildRequires: python3-pbr -BuildRequires: python3-setuptools - -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-keystoneauth1 >= 3.5.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable >= 0.7.2 -Requires: python3-stevedore >= 2.0.1 +BuildRequires: pyproject-rpm-macros %description -n python3-%{sname} %{common_desc} @@ -61,14 +55,6 @@ Requires: python3-stevedore >= 2.0.1 %package doc Summary: Documentation for OpenStack Nova API Client -BuildRequires: python3-sphinx -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-oslo-utils -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-oslo-serialization -BuildRequires: python3-prettytable - %description doc %{common_desc} @@ -82,14 +68,34 @@ This package contains auto-generated documentation. %endif %autosetup -n %{name}-%{upstream_version} -S git -# Let RPM handle the requirements -rm -rf *requirements.txt +sed -i /^[[:space:]]*-c{env:.*_CONSTRAINTS_FILE.*/d tox.ini +sed -i "s/^deps = -c{env:.*_CONSTRAINTS_FILE.*/deps =/" tox.ini +sed -i /^minversion.*/d tox.ini +sed -i /^requires.*virtualenv.*/d tox.ini +sed -i /^.*whereto/d 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 # Create a versioned binary for backwards compatibility until everything is pure py3 ln -s nova %{buildroot}%{_bindir}/nova-3 @@ -101,11 +107,9 @@ install -pm 644 tools/nova.bash_completion \ rm -fr %{buildroot}%{python3_sitelib}/novaclient/tests %if 0%{?with_doc} -sphinx-build -b html doc/source doc/build/html +%tox -e docs sphinx-build -b man doc/source doc/build/man - install -p -D -m 644 doc/build/man/nova.1 %{buildroot}%{_mandir}/man1/nova.1 - # Fix hidden-file-or-dir warnings rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo doc/build/html/.htaccess %endif @@ -114,7 +118,7 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo doc/build/html/.htacce %license LICENSE %doc README.rst %{python3_sitelib}/%{sname} -%{python3_sitelib}/*.egg-info +%{python3_sitelib}/*.dist-info %{_sysconfdir}/bash_completion.d %if 0%{?with_doc} %{_mandir}/man1/nova.1.gz @@ -129,6 +133,9 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo doc/build/html/.htacce %endif %changelog +* Wed Oct 25 2023 Alfredo Moralejo 1:18.4.0-1 +- Update to upstream version 18.4.0 + * Fri Jul 21 2023 Fedora Release Engineering - 1:18.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d33a7de..0b3696d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (python-novaclient-18.3.0.tar.gz.asc) = 3f54b5bb0687099a14123d63c27cc29aa311178e98fcddabcdf23ae140ed7884fd4fb6414a552399c2739b64a0ddcbf8797c332ae807bb23977fbed526cd243e -SHA512 (0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt) = cc8731a0fbdf791e51887609d13ee0ba402528572ab075419be998e29510211a6423fdfabc694eef8b654403d43cdcfc6b06ee244df58c5c4abc3e77ce85da24 -SHA512 (python-novaclient-18.3.0.tar.gz) = 7a365a512922daeda034fde3404f9962039a8dc9164b8261a916131955f45a0539302a051871bac5efdbc42bb98f590221729a7cd552cf05116cc5853b77690d +SHA512 (python-novaclient-18.4.0.tar.gz) = 767d53c3fa3b312b2210dcdbe8895baefa167c00041fe6b228a30099c892b17ed4339477894a81d314b746da5c2a772a07e7a887eb807a31ef7bbdbea621c40f +SHA512 (0x815afec729392386480e076dcc0dfe2d21c023c9.txt) = be660eacaae93572475d0ae4e9cc29fc90897ec8a2ca8f4d0c5c7dcf682de9933e71a811f82b067fe5cb92de90165099ad7b49be98a6082c733a7f6b5b5f5a77 +SHA512 (python-novaclient-18.4.0.tar.gz.asc) = 22dac3481ee707d619eadc8eb705bfb68cb0fdc80249a4d3f849000bfcf75acf7bdc709c1c5f6148a45a115acc81dee087289752355bff9800edc79db39e840e