openstack/rpm-packaging
Code Issues Proposed changes

Another round of updates

Browse Source 
- Do some spec cleanup
- Use python3 for doc builds

Change-Id: Ic43f49f80b1b0c78947a42a9273d2aeb3032a4c8
This commit is contained in:
Thomas Bechtold
2019-08-27 11:21:33 +02:00
parent 701963dca6
commit ff261cedea
8 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/ironic-lib/ironic-lib.spec.j2
View File

@@ -1,5 +1,5 @@
{% set pypi_name = 'ironic-lib' %}
{% set upstream_version = upstream_version('2.19.0') %}
{% set upstream_version = upstream_version('2.20.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
@@ -26,6 +26,7 @@ Requires: {{ py3('oslo.concurrency') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.service') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('requests') }}

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

@@ -1,13 +1,16 @@
%global sname keystonemiddleware
Name: {{ py2name('keystonemiddleware') }}
Version: 6.1.0
Release: 0
{% set pypi_name = 'keystonemiddleware' %}
{% set upstream_version = upstream_version('7.0.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: Middleware for OpenStack Identity
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://launchpad.net/%{sname}
Source0: https://files.pythonhosted.org/packages/source/k/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openssl
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']) }}
@@ -40,6 +43,7 @@ Requires: {{ py2pkg('oslo.cache') }}
Requires: {{ py2pkg('oslo.config') }}
Requires: {{ py2pkg('oslo.context') }}
Requires: {{ py2pkg('oslo.i18n') }}
Requires: {{ py2pkg('oslo.log') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('oslo.utils') }}
Requires: {{ py2pkg('pycadf') }}
@@ -57,15 +61,15 @@ does not expose any CLI or Python API features.
%package -n {{ py2name('keystonemiddleware') }}-doc
Summary: Documentation for Middleware for OpenStack Identity
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('sphinxcontrib-apidoc') }}
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('openstackdocstheme') }}
BuildRequires: {{ py3('sphinxcontrib-apidoc') }}
%description -n {{ py2name('keystonemiddleware') }}-doc
Documentation for Middleware for OpenStack Identity.
%prep
%autosetup -p1 -n %{sname}-%{version}
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build
@@ -76,7 +80,7 @@ Documentation for Middleware for OpenStack Identity.
# generate html docs
export PYTHONPATH=.
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
@@ -86,8 +90,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
%files %python_files
%license LICENSE
%doc ChangeLog README.rst
%{python2_sitelib}/%{sname}
%{python2_sitelib}/*.egg-info
%{python_sitelib}/{{ pypi_name }}
%{python_sitelib}/*.egg-info
%files -n {{ py2name('keystonemiddleware') }}-doc
%doc doc/build/html

9
openstack/mistral-lib/mistral-lib.spec.j2
View File

@@ -1,5 +1,5 @@
Name: {{ py2name('mistral-lib') }}
Version: 1.1.0
Version: 1.2.0
Release: 0
Summary: Mistral shared routings and utilities
License: {{ license('Apache-2.0') }}
@@ -7,13 +7,14 @@ Group: Development/Languages/Python
URL: http://www.openstack.org/
Source0: https://files.pythonhosted.org/packages/source/m/mistral-lib/mistral-lib-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('eventlet') }}
BuildRequires: {{ py2pkg('oslo.log') }}
BuildRequires: {{ py2pkg('oslo.serialization') }}
BuildRequires: {{ py2pkg('oslosphinx') }}
BuildRequires: {{ py2pkg('oslotest') }}
BuildRequires: {{ py2pkg('stestr') }}
BuildRequires: {{ py2pkg('testscenarios') }}
BuildRequires: {{ py2pkg('testtools') }}
Requires: {{ py2pkg('eventlet') }}
Requires: {{ py2pkg('oslo.log') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('pbr') }}
BuildArch: noarch

10
openstack/octavia-lib/octavia-lib.spec.j2
View File

@@ -1,8 +1,10 @@
{% set pypi_name = 'octavia-lib' %}
{% set upstream_version = upstream_version('1.2.0') %}
{% set upstream_version = upstream_version('1.3.1') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%if 0%{?rdo}
%define skip_python2 1
%endif
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
@@ -21,11 +23,13 @@ BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('tenacity', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('oslo.i18n') }}
Requires: {{ py2pkg('oslo.log') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('pbr') }}
Requires: {{ py2pkg('six') }}
Requires: {{ py2pkg('tenacity') }}
BuildArch: noarch
%python_subpackages
@@ -36,7 +40,7 @@ This python module provides a python library for Octavia provider driver
developers.
%prep
%autosetup -p1 -n octavia-lib-%{version}
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build

8
openstack/os-brick/os-brick.spec.j2
View File

@@ -1,5 +1,5 @@
{% set pypi_name = 'os-brick' %}
{% set upstream_version = upstream_version('2.9.0') %}
{% set upstream_version = upstream_version('2.9.1') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
# NOTE(ykarel): This is required to prevent singlespec macros from changing the requires
@@ -60,8 +60,8 @@ Features:
%package -n {{ py2name() }}-doc
Summary: Documentation for OpenStack os-brick library
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('openstackdocstheme') }}
%description -n {{ py2name() }}-doc
OpenStack Cinder brick library for managing local volume attaches.
@@ -84,7 +84,7 @@ Configuration files for the OpenStack Cinder brick library.
%{python_build}
# generate html docs
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

9
openstack/oslo.middleware/oslo.middleware.spec.j2
View File

@@ -1,5 +1,5 @@
{% set pypi_name = 'oslo.middleware' %}
{% set upstream_version = upstream_version('3.38.0') %}
{% set upstream_version = upstream_version('3.38.1') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
@@ -52,9 +52,8 @@ for limiting size/connection etc.
%package -n python-oslo-middleware-doc
Summary: Documentation for OpenStack middleware library
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('reno') }}
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('openstackdocstheme') }}
%description -n python-oslo-middleware-doc
Oslo middleware library includes components that can be injected into wsgi
@@ -71,7 +70,7 @@ This package contains the documentation.
%{python_build}
# generate html docs
PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}

42
openstack/oslotest/0001-Stop-testing-mock-functionality.patch
View File

@@ -1,42 +0,0 @@
From f8f6b14088637fd87de7cf385b840d6b5e5f9b22 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Tue, 28 May 2019 17:04:19 +0000
Subject: [PATCH] Stop testing mock functionality
There's no particular reason for us to be verifying mock's behavior.
They have their own unit tests for doing that.
This is specifically a problem right now because mock changed its
behavior in 3.0.0 and broke this test: "Issue #36366: Calling stop()
on an unstarted or stopped unittest.mock.patch() object will now
return None instead of raising RuntimeError, making the method
idempotent."
Change-Id: I57db9bad15cab343e152615e115e2ba3ac4d87fe
Closes-Bug: 1830429
---
oslotest/tests/unit/test_base.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/oslotest/tests/unit/test_base.py b/oslotest/tests/unit/test_base.py
index 93c3c52..b98c672 100644
--- a/oslotest/tests/unit/test_base.py
+++ b/oslotest/tests/unit/test_base.py
@@ -126,14 +126,6 @@ class TestManualMock(base.BaseTestCase):
self.addCleanup(patcher.stop)
super(TestManualMock, self).setUp()
self.useFixture(fixtures.MockPatch('fixtures.Timeout'))
- self.unstopped = mock.patch('os.environ.put')
-
- def tearDown(self):
- super(TestManualMock, self).tearDown()
- self.assertRaises(
- RuntimeError,
- self.unstopped.stop,
- )
def test_mock_patch_manually(self):
# Verify that if a test instance creates its own mock and
--
2.22.0

3
openstack/oslotest/oslotest.spec.j2
View File

@@ -1,5 +1,5 @@
{% set pypi_name = 'oslotest' %}
{% set upstream_version = upstream_version('3.7.1') %}
{% set upstream_version = upstream_version('3.8.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
@@ -11,7 +11,6 @@ License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://launchpad.net/oslotest
Source0: {{ source }}
Patch0: 0001-Stop-testing-mock-functionality.patch
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('debtcollector', py_versions=['py2', 'py3']) }}