openstack/rpm-packaging
Code Issues Proposed changes

vmware-nsx: Switch to python3

Browse Source 
Also drop BuildRequires for testing. There is no %check section. And
to enable tests, more packages are needed.

Change-Id: Ic7b02740c8822a98c6a08f3546095e462780ae09
This commit is contained in:
Thomas Bechtold 2019-09-24 15:26:25 +02:00
parent e9d7bbfa6d
commit 0ac8f9ff13
1 changed files with 33 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
openstack/vmware-nsx/vmware-nsx.spec.j2
View File

@ -3,7 +3,7 @@
{% set upstream_version = upstream_version() %} {% set upstream_version = upstream_version() %}
{% set rpm_release = '1' %} {% set rpm_release = '1' %}
Name: {{ py2name() }} Name: {{ py2name(py_versions=['py3']) }}
Version: {{ py2rpmversion() }} Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }} Release: {{ py2rpmrelease() }}
Summary: VMware-NSX family of Neutron plugins Summary: VMware-NSX family of Neutron plugins
@ -12,47 +12,28 @@ Group: Development/Languages/Python
URL: https://launchpad.net/vmware-nsx URL: https://launchpad.net/vmware-nsx
Source0: {{ source|basename }} Source0: {{ source|basename }}
BuildRequires: openstack-macros BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('neutron-lib') }} BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py2pkg('oslo.vmware') }} Requires: {{ py3('PrettyTable') }}
BuildRequires: {{ py2pkg('tooz') }} Requires: {{ py3('SQLAlchemy') }}
BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} Requires: {{ py3('decorator') }}
BuildRequires: {{ py2pkg('oslo.log', py_versions=['py2', 'py3']) }} Requires: {{ py3('eventlet') }}
BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }} Requires: {{ py3('httplib2') }}
BuildRequires: {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }} Requires: {{ py3('mock') }}
BuildRequires: {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }} Requires: {{ py3('netaddr') }}
BuildRequires: {{ py2pkg('testresources', py_versions=['py2', 'py3']) }} Requires: {{ py3('python-openstackclient') }}
BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }} Requires: {{ py3('osc-lib') }}
BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }} Requires: {{ py3('oslo.concurrency') }}
BuildRequires: {{ py2pkg('vmware-nsxlib', py_versions=['py2', 'py3']) }} Requires: {{ py3('oslo.config') }}
Requires: {{ py2pkg('PrettyTable') }} Requires: {{ py3('oslo.db') }}
Requires: {{ py2pkg('SQLAlchemy') }} Requires: {{ py3('oslo.i18n') }}
Requires: {{ py2pkg('decorator') }} Requires: {{ py3('oslo.log') }}
Requires: {{ py2pkg('eventlet') }} Requires: {{ py3('oslo.serialization') }}
Requires: {{ py2pkg('httplib2') }} Requires: {{ py3('oslo.utils') }}
Requires: {{ py2pkg('mock') }} Requires: {{ py3('six') }}
Requires: {{ py2pkg('netaddr') }} Requires: {{ py3('stevedore') }}
Requires: {{ py2pkg('python-openstackclient') }} Requires: {{ py3('tenacity') }}
Requires: {{ py2pkg('osc-lib') }} Requires: {{ py3('vmware-nsxlib') }}
Requires: {{ py2pkg('oslo.concurrency') }}
Requires: {{ py2pkg('oslo.config') }}
Requires: {{ py2pkg('oslo.db') }}
Requires: {{ py2pkg('oslo.i18n') }}
Requires: {{ py2pkg('oslo.log') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('oslo.utils') }}
Requires: {{ py2pkg('six') }}
Requires: {{ py2pkg('stevedore') }}
Requires: {{ py2pkg('tenacity') }}
Requires: {{ py2pkg('vmware-nsxlib') }}
BuildArch: noarch BuildArch: noarch
%ifpython2
Requires: {{ py2pkg('enum34') }}
Requires: {{ py2pkg('neutron-lib') }}
Requires: {{ py2pkg('oslo.service') }}
Requires: {{ py2pkg('oslo.vmware') }}
Requires: {{ py2pkg('tooz') }}
%endif
%python_subpackages
%description %description
VMWare NSX plugins for the OpenStack Neutron component VMWare NSX plugins for the OpenStack Neutron component
@ -61,8 +42,8 @@ VMWare NSX plugins for the OpenStack Neutron component
Summary: Documentation for vmware-nsx Summary: Documentation for vmware-nsx
Group: Documentation/HTML Group: Documentation/HTML
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: {{ py2pkg('Sphinx') }} BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }} BuildRequires: {{ py3('openstackdocstheme') }}
%description -n python-vmware-nsx-doc %description -n python-vmware-nsx-doc
VMWare NSX plugins for the OpenStack Neutron component VMWare NSX plugins for the OpenStack Neutron component
@ -71,35 +52,25 @@ This package contains the documentation
%prep %prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }} %autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup %py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build %build
%{python_build} %{py3_build}
# generate html docs # generate html docs
PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers # remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo} rm -rf doc/build/html/.{doctrees,buildinfo}
%fdupes doc/build/html/ %fdupes doc/build/html/
%install %install
%{python_install} %{py3_install}
%python_clone -a %{buildroot}%{_bindir}/neutron-check-nsx-config
%python_clone -a %{buildroot}%{_bindir}/nsxadmin
%python_clone -a %{buildroot}%{_bindir}/nsx-migration
# remove duplicates
%fdupes %{buildroot}%{python_sitelib}
# %check %files
# %{python_expand rm -rf .testrepository
# }
%files %{python_files}
%license LICENSE %license LICENSE
%{python_sitelib}/vmware_nsx %{python3_sitelib}/vmware_nsx
%{python_sitelib}/*.egg-info %{python3_sitelib}/*.egg-info
%python_alternative %{_bindir}/neutron-check-nsx-config %{_bindir}/neutron-check-nsx-config
%python_alternative %{_bindir}/nsxadmin %{_bindir}/nsxadmin
%python_alternative %{_bindir}/nsx-migration %{_bindir}/nsx-migration
%files -n python-vmware-nsx-doc %files -n python-vmware-nsx-doc
%license LICENSE %license LICENSE