openstack/rpm-packaging
Code Issues Proposed changes

Remove explict sed for doc build warnings

Browse Source 
This is now obsolete, as the %py_req_cleanup macro does that
as a side-effect.

Change-Id: Ib3301ce22a618e85103499aa8de5375af3973326
This commit is contained in:
Dirk Mueller
2017-09-25 18:49:14 +02:00
parent 9dc46b2a88
commit c0ed47c3ee
14 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/Tempest/Tempest.spec.j2
View File

@@ -75,7 +75,6 @@ Documentation for the OpenStack Integration Test Suite.
%prep
%autosetup -n %{sname}-%{version}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{py2_build}

1
openstack/automaton/automaton.spec.j2
View File

@@ -40,7 +40,6 @@ Documentation for the Automaton library.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}

2
openstack/cliff/cliff.spec.j2
View File

@@ -57,7 +57,7 @@ This package contains documentation files for %{name}.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%py_req_cleanup
%build

1
openstack/debtcollector/debtcollector.spec.j2
View File

@@ -58,7 +58,6 @@ This package contains documentation in HTML format.
%prep
%autosetup -n %{pypi_name}-%{version}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%python_build

1
openstack/futurist/futurist.spec.j2
View File

@@ -42,7 +42,6 @@ Useful additions to futures, from the future.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}

1
openstack/glance_store/glance_store.spec.j2
View File

@@ -86,7 +86,6 @@ Documentation for the Glance store library.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}

1
openstack/keystone/keystone.spec.j2
View File

@@ -170,7 +170,6 @@ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
sed -i 's#/local/bin#/bin#' httpd/wsgi-keystone.conf
sed -i 's#apache2#httpd#' httpd/wsgi-keystone.conf
%endif
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{py3_build}

1
openstack/keystoneauth1/keystoneauth1.spec.j2
View File

@@ -56,7 +56,6 @@ Documentation for OpenStack authenticating tools.
%prep
%autosetup -p1 -n %{sname}-%{version}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
# cleanup intersphinx (we have no network during build)
echo "intersphinx_mapping = {}" >> doc/source/conf.py

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

@@ -67,7 +67,6 @@ Documentation for Middleware for OpenStack Identity.
%prep
%autosetup -p1 -n %{sname}-%{version}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}

2
openstack/neutron-lib/neutron-lib.spec.j2
View File

@@ -85,7 +85,7 @@ OpenStack Neutron library shared by all Neutron sub-projects.
%prep
%autosetup -n neutron-lib-%{version}
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%py_req_cleanup
%build
%{python_build}

2
openstack/nova/nova.spec.j2
View File

@@ -445,6 +445,7 @@ BuildRequires: {{ py2pkg('keystonemiddleware') }}
BuildRequires: {{ py2pkg('lxml') }}
BuildRequires: {{ py2pkg('netifaces') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('os-resource-classes') }}
BuildRequires: {{ py2pkg('oslosphinx') }}
BuildRequires: {{ py2pkg('paramiko') }}
BuildRequires: {{ py2pkg('psutil') }}
@@ -469,7 +470,6 @@ This package contains documentation files for nova.
%py_req_cleanup
find . \( -name .gitignore -o -name .placeholder \) -delete
find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{py2_build}

2
openstack/openstacksdk/openstacksdk.spec.j2
View File

@@ -99,8 +99,6 @@ applications to work with OpenStack clouds.
%py_req_cleanup
sed -i -e 's,coverage.*,,' test-requirements.txt || true
sed -i -e "s,'sphinx.ext.intersphinx'\,,," doc/source/conf.py
# build fails with warnings
sed -i 's/^warning-is-error.*/warning-is-error=0/g' setup.cfg
%build
%python_build

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

@@ -78,8 +78,7 @@ Configuration files for the OpenStack Cinder brick library.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
rm -rf *requirements.txt
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%py_req_cleanup
%build
%{python_build}

1
openstack/os-service-types/os-service-types.spec.j2
View File

@@ -46,7 +46,6 @@ This package contains the documentation.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
# The TestRemote test cases must be excluded because they introduce a circular
# dependency on python-keystoneauth1.
# Using --black-regex with stestr is not enough because the problem occurs when