From 9f4d09ed3edc16b29455949ae50afce8cf254ee9 Mon Sep 17 00:00:00 2001 From: "Chen, Yan" Date: Fri, 3 Apr 2020 02:38:28 +0000 Subject: [PATCH] remove useless clients Remove following clients that are not used by StarlingX anymore: - python-magnumclient - python-muranoclient Story: 2007502 Task: 39259 Task: 39260 Depends-on: https://review.opendev.org/#/c/716818 Change-Id: I5cb4a2c82af7d3eb9bf9bf19c0d9c36164c7009b Signed-off-by: Chen, Yan --- centos_iso_image.inc | 2 - centos_pkg_dirs | 2 - .../centos/build_srpm.data | 5 - .../centos/python-magnumclient.spec | 266 ------------------ .../centos/python-magnumclient.spec.orig | 250 ---------------- .../centos/build_srpm.data | 3 - .../centos/python-muranoclient.spec | 202 ------------- .../centos/python-muranoclient.spec.orig | 182 ------------ 8 files changed, 912 deletions(-) delete mode 100644 openstack/python-magnumclient/centos/build_srpm.data delete mode 100644 openstack/python-magnumclient/centos/python-magnumclient.spec delete mode 100644 openstack/python-magnumclient/centos/python-magnumclient.spec.orig delete mode 100644 openstack/python-muranoclient/centos/build_srpm.data delete mode 100644 openstack/python-muranoclient/centos/python-muranoclient.spec delete mode 100644 openstack/python-muranoclient/centos/python-muranoclient.spec.orig diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 9302aa16..9eeb40d3 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -22,8 +22,6 @@ python2-gnocchiclient python2-heatclient python2-ironicclient python2-keystoneclient -python2-magnumclient -python2-muranoclient python2-neutronclient python2-novaclient python2-openstackclient diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 7ee0a66d..5f99e617 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,6 +1,4 @@ -openstack/python-muranoclient openstack/python-ironicclient -openstack/python-magnumclient openstack/openstack-ras openstack/openstack-os-vif openstack/python-aodhclient diff --git a/openstack/python-magnumclient/centos/build_srpm.data b/openstack/python-magnumclient/centos/build_srpm.data deleted file mode 100644 index c73da696..00000000 --- a/openstack/python-magnumclient/centos/build_srpm.data +++ /dev/null @@ -1,5 +0,0 @@ -TAR_NAME="python-magnumclient" -SRC_DIR="$CGCS_BASE/git/python-magnumclient" -TIS_BASE_SRCREV="2.12.0" -TIS_PATCH_VER=GITREVCOUNT - diff --git a/openstack/python-magnumclient/centos/python-magnumclient.spec b/openstack/python-magnumclient/centos/python-magnumclient.spec deleted file mode 100644 index 129b6717..00000000 --- a/openstack/python-magnumclient/centos/python-magnumclient.spec +++ /dev/null @@ -1,266 +0,0 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global sname python-magnumclient -%global pname magnumclient - -%if 0%{?fedora} >= 24 -%global with_python3 1 -%global default_python 3 -%else -%global default_python 2 -%endif - -%global common_desc \ -This is a client library for Magnum built on the Magnum API. \ -It provides a Python API (the magnumclient module) and a \ -command-line tool (magnum). - -%global common_desc_tests Python-magnumclient test subpackage - -Name: python-%{pname} -Version: 2.12.0 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Client library for Magnum API - -License: ASL 2.0 -URL: https://launchpad.net/python-magnumclient -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz -BuildArch: noarch - -%description -%{common_desc} - -%package -n python2-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python2-%{pname}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pip -BuildRequires: python2-wheel -BuildRequires: python2-pbr -BuildRequires: git - -# test dependencies -BuildRequires: python2-oslo-utils -BuildRequires: python2-openstackclient -BuildRequires: python2-oslo-serialization -BuildRequires: python2-oslo-log -BuildRequires: python2-osprofiler -BuildRequires: python2-stevedore -BuildRequires: python2-requests -BuildRequires: python2-oslo-i18n -BuildRequires: python2-fixtures -BuildRequires: python2-mock -BuildRequires: python2-testtools -BuildRequires: python2-keystoneauth1 -BuildRequires: python2-prettytable - -Requires: python2-babel -Requires: python2-cryptography -Requires: python2-keystoneauth1 >= 3.4.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-osc-lib >= 1.8.0 -Requires: python2-os-client-config >= 1.28.0 -Requires: python2-pbr -Requires: python2-prettytable -Requires: python2-six -%if 0%{?fedora} > 0 -Requires: python2-decorator -%else -Requires: python-decorator -%endif - -%description -n python2-%{pname} -%{common_desc} - -%if 0%{?with_python3} -%package -n python3-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python3-%{pname}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr - -# test dependencies -BuildRequires: python3-oslo-utils -BuildRequires: python3-openstackclient -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-log -BuildRequires: python3-osprofiler -BuildRequires: python3-stevedore -BuildRequires: python3-requests -BuildRequires: python3-oslo-i18n -BuildRequires: python3-fixtures -BuildRequires: python3-mock -BuildRequires: python3-testtools -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-prettytable - -Requires: python3-babel -Requires: python3-cryptography -Requires: python3-decorator -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-osc-lib >= 1.8.0 -Requires: python3-os-client-config >= 1.28.0 -Requires: python3-pbr -Requires: python3-prettytable -Requires: python3-six - -%description -n python3-%{pname} -%{common_desc} -%endif - -%package -n python-%{pname}-doc -Summary: python-magnumclient documentation -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-os-client-config -BuildRequires: openstack-macros -%if 0%{?fedora} > 0 -BuildRequires: python2-decorator -%else -BuildRequires: python-decorator -%endif - -%description -n python-%{pname}-doc -Documentation for python-magnumclient - -%package -n python2-%{pname}-tests -Summary: Python-magnumclient test subpackage -%{?python_provide:%python_provide python2-%{pname}-tests} - -Requires: python2-%{pname} = %{version}-%{release} -Requires: python2-oslo-utils -Requires: python2-stevedore -Requires: python2-requests -Requires: python2-oslo-i18n -Requires: python2-fixtures -Requires: python2-mock -Requires: python2-testtools -Requires: python2-keystoneauth1 -Requires: python2-prettytable - -%description -n python2-%{pname}-tests -%{common_desc_tests} - -%if 0%{?with_python3} -%package -n python3-%{pname}-tests -Summary: Python-magnumclient test subpackage - -Requires: python3-%{pname} = %{version}-%{release} -Requires: python3-oslo-utils -Requires: python3-stevedore -Requires: python3-requests -Requires: python3-oslo-i18n -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-testtools -Requires: python3-keystoneauth1 -Requires: python3-prettytable - -%description -n python3-%{pname}-tests -%{common_desc_tests} -%endif - -%prep -%autosetup -n %{name}-%{upstream_version} -S git - -# let RPM handle deps -%py_req_cleanup - -%build -export PBR_VERSION=%{version} -%py2_build -%py2_build_wheel - -%if 0%{?with_python3} -%py3_build -%endif -# generate html docs -# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a -# tagged release -sphinx-build -b html doc/source doc/build/html -# Fix hidden-file-or-dir warnings -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -export PBR_VERSION=%{version} -%if 0%{?with_python3} -%py3_install -%if %{default_python} >= 3 -mv %{buildroot}%{_bindir}/magnum ./magnum.py3 -%endif -%endif - -%py2_install - -%if 0%{?default_python} >= 3 -mv magnum.py3 %{buildroot}%{_bindir}/magnum -%endif - -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - -%check -# tests are failing due to unicode not defined -# we are skipping the test -%{__python2} setup.py test || -%if 0%{?with_python3} -%{__python3} setup.py test || -%endif - -%files -n python2-%{pname} -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{pname} -%if 0%{?default_python} <= 2 -%{_bindir}/magnum -%endif -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname} -%doc README.rst -%license LICENSE -%if 0%{?default_python} >= 3 -%{_bindir}/magnum -%endif -%{python3_sitelib}/magnumclient -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/%{pname}/tests -%endif - -%files -n python-%{pname}-doc -%license LICENSE -%doc doc/build/html - -%files -n python2-%{pname}-tests -%{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname}-tests -%{python3_sitelib}/%{pname}/tests -%endif - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* - -%changelog -* Thu Aug 09 2018 RDO 2.10.0-1 -- Update to 2.10.0 - diff --git a/openstack/python-magnumclient/centos/python-magnumclient.spec.orig b/openstack/python-magnumclient/centos/python-magnumclient.spec.orig deleted file mode 100644 index a20f9993..00000000 --- a/openstack/python-magnumclient/centos/python-magnumclient.spec.orig +++ /dev/null @@ -1,250 +0,0 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global sname python-magnumclient -%global pname magnumclient - -%if 0%{?fedora} >= 24 -%global with_python3 1 -%global default_python 3 -%else -%global default_python 2 -%endif - -%global common_desc \ -This is a client library for Magnum built on the Magnum API. \ -It provides a Python API (the magnumclient module) and a \ -command-line tool (magnum). - -%global common_desc_tests Python-magnumclient test subpackage - -Name: python-%{pname} -Version: 2.10.0 -Release: 1%{?dist} -Summary: Client library for Magnum API - -License: ASL 2.0 -URL: https://launchpad.net/python-magnumclient -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz -BuildArch: noarch - -%description -%{common_desc} - -%package -n python2-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python2-%{pname}} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pbr -BuildRequires: git - -# test dependencies -BuildRequires: python2-oslo-utils -BuildRequires: python2-openstackclient -BuildRequires: python2-oslo-serialization -BuildRequires: python2-oslo-log -BuildRequires: python2-osprofiler -BuildRequires: python2-stevedore -BuildRequires: python2-requests -BuildRequires: python2-oslo-i18n -BuildRequires: python2-fixtures -BuildRequires: python2-mock -BuildRequires: python2-testtools -BuildRequires: python2-keystoneauth1 -BuildRequires: python2-prettytable - -Requires: python2-babel -Requires: python2-cryptography -Requires: python2-keystoneauth1 >= 3.4.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-osc-lib >= 1.8.0 -Requires: python2-os-client-config >= 1.28.0 -Requires: python2-pbr -Requires: python2-prettytable -Requires: python2-six -%if 0%{?fedora} > 0 -Requires: python2-decorator -%else -Requires: python-decorator -%endif - -%description -n python2-%{pname} -%{common_desc} - -%if 0%{?with_python3} -%package -n python3-%{pname} -Summary: Client library for Magnum API -%{?python_provide:%python_provide python3-%{pname}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr - -# test dependencies -BuildRequires: python3-oslo-utils -BuildRequires: python3-openstackclient -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-log -BuildRequires: python3-osprofiler -BuildRequires: python3-stevedore -BuildRequires: python3-requests -BuildRequires: python3-oslo-i18n -BuildRequires: python3-fixtures -BuildRequires: python3-mock -BuildRequires: python3-testtools -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-prettytable - -Requires: python3-babel -Requires: python3-cryptography -Requires: python3-decorator -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-osc-lib >= 1.8.0 -Requires: python3-os-client-config >= 1.28.0 -Requires: python3-pbr -Requires: python3-prettytable -Requires: python3-six - -%description -n python3-%{pname} -%{common_desc} -%endif - -%package -n python-%{pname}-doc -Summary: python-magnumclient documentation -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-os-client-config -BuildRequires: openstack-macros -%if 0%{?fedora} > 0 -BuildRequires: python2-decorator -%else -BuildRequires: python-decorator -%endif - -%description -n python-%{pname}-doc -Documentation for python-magnumclient - -%package -n python2-%{pname}-tests -Summary: Python-magnumclient test subpackage -%{?python_provide:%python_provide python2-%{pname}-tests} - -Requires: python2-%{pname} = %{version}-%{release} -Requires: python2-oslo-utils -Requires: python2-stevedore -Requires: python2-requests -Requires: python2-oslo-i18n -Requires: python2-fixtures -Requires: python2-mock -Requires: python2-testtools -Requires: python2-keystoneauth1 -Requires: python2-prettytable - -%description -n python2-%{pname}-tests -%{common_desc_tests} - -%if 0%{?with_python3} -%package -n python3-%{pname}-tests -Summary: Python-magnumclient test subpackage - -Requires: python3-%{pname} = %{version}-%{release} -Requires: python3-oslo-utils -Requires: python3-stevedore -Requires: python3-requests -Requires: python3-oslo-i18n -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-testtools -Requires: python3-keystoneauth1 -Requires: python3-prettytable - -%description -n python3-%{pname}-tests -%{common_desc_tests} -%endif - -%prep -%autosetup -n %{name}-%{upstream_version} -S git - -# let RPM handle deps -%py_req_cleanup - -%build -%py2_build - -%if 0%{?with_python3} -%py3_build -%endif -# generate html docs -# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a -# tagged release -sphinx-build -b html doc/source doc/build/html -# Fix hidden-file-or-dir warnings -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install - -%if 0%{?with_python3} -%py3_install -%if %{default_python} >= 3 -mv %{buildroot}%{_bindir}/magnum ./magnum.py3 -%endif -%endif - -%py2_install - -%if 0%{?default_python} >= 3 -mv magnum.py3 %{buildroot}%{_bindir}/magnum -%endif - -%check -# tests are failing due to unicode not defined -# we are skipping the test -%{__python2} setup.py test || -%if 0%{?with_python3} -%{__python3} setup.py test || -%endif - -%files -n python2-%{pname} -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{pname} -%if 0%{?default_python} <= 2 -%{_bindir}/magnum -%endif -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname} -%doc README.rst -%license LICENSE -%if 0%{?default_python} >= 3 -%{_bindir}/magnum -%endif -%{python3_sitelib}/magnumclient -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/%{pname}/tests -%endif - -%files -n python-%{pname}-doc -%license LICENSE -%doc doc/build/html - -%files -n python2-%{pname}-tests -%{python2_sitelib}/%{pname}/tests - -%if 0%{?with_python3} -%files -n python3-%{pname}-tests -%{python3_sitelib}/%{pname}/tests -%endif - -%changelog -* Thu Aug 09 2018 RDO 2.10.0-1 -- Update to 2.10.0 - diff --git a/openstack/python-muranoclient/centos/build_srpm.data b/openstack/python-muranoclient/centos/build_srpm.data deleted file mode 100644 index aa475187..00000000 --- a/openstack/python-muranoclient/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -TAR_NAME="python-muranoclient" -SRC_DIR="$CGCS_BASE/git/python-muranoclient" -TIS_PATCH_VER=1 diff --git a/openstack/python-muranoclient/centos/python-muranoclient.spec b/openstack/python-muranoclient/centos/python-muranoclient.spec deleted file mode 100644 index 363e6f62..00000000 --- a/openstack/python-muranoclient/centos/python-muranoclient.spec +++ /dev/null @@ -1,202 +0,0 @@ -%global pypi_name muranoclient - -%if 0%{?fedora} -%global with_python3 0 -%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')} -%endif - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global common_desc \ -Client library for Murano built on the Murano API. It provides a Python \ -API (the muranoclient module) and a command-line tool (murano). - -Name: python-%{pypi_name} -Version: 1.1.1 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Client library for OpenStack Murano API - -License: ASL 2.0 -URL: http://pypi.python.org/pypi/%{name} -Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - -%description -%{common_desc} - -%package -n python2-%{pypi_name} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-wheel -BuildRequires: python2-pbr >= 2.0.0 - -Requires: python2-babel >= 2.3.4 -Requires: python2-glanceclient >= 1:2.8.0 -Requires: python2-iso8601 >= 0.1.11 -Requires: python2-keystoneclient >= 1:3.8.0 -Requires: python2-murano-pkg-check >= 0.3.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-prettytable >= 0.7.2 -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 -Requires: python2-yaql >= 1.1.3 -Requires: python2-osc-lib >= 1.10.0 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-pyOpenSSL >= 16.2.0 -%if 0%{?fedora} > 0 -Requires: python2-pyyaml >= 3.10 -%else -Requires: PyYAML >= 3.10 -%endif - -Summary: Client library for OpenStack Murano API. -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -%{common_desc} - -# Python3 package -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: Support of EC2 API for OpenStack -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python-tools - -Requires: python3-babel >= 2.3.4 -Requires: python3-glanceclient >= 1:2.8.0 -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-keystoneclient >= 1:3.8.0 -Requires: python3-murano-pkg-check >= 0.3.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable >= 0.7.2 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-yaql >= 1.1.3 -Requires: python3-osc-lib >= 1.10.0 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pyOpenSSL >= 16.2.0 -Requires: python3-PyYAML >= 3.10 - -%description -n python3-%{pypi_name} -%{common_desc} -%endif - -# Documentation package -%package -n python-%{pypi_name}-doc -Summary: Documentation for OpenStack Murano API Client - -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme - -%description -n python-%{pypi_name}-doc -Documentation for the client library for interacting with Openstack -Murano API. - -%prep -%autosetup -n %{name}-%{upstream_version} -S git -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info -# Let RPM handle the dependencies -%py_req_cleanup - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -2to3 --write --nobackups %{py3dir} -%endif - -%build -export PBR_VERSION=%{version} -%{__python2} setup.py build -%py2_build_wheel - -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py build -popd -%endif - -# generate html docs -export PYTHONPATH=. -sphinx-build -W -b html doc/source doc/build/html -# remove the sphinx-build leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -export PBR_VERSION=%{version} -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot} -mv %{buildroot}%{_bindir}/murano %{buildroot}%{_bindir}/python3-murano -popd -%endif - -%{__python2} setup.py install --skip-build --root %{buildroot} - -# rename binaries, make compat symlinks -pushd %{buildroot}%{_bindir} -%if 0%{?with_python3} -for i in %{pypi_name}-{3,%{?python3_shortver}}; do - ln -s python3-%{pypi_name} $i -done -%endif -popd - -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - - -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info -%{_bindir}/murano* - -# Files for python3 -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%license LICENSE -%doc README.rst -%{_bindir}/python3-murano -%{_bindir}/murano* -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/python_%{pypi_name}-%{version}-py?.?.egg-info -%endif - -%files -n python-%{pypi_name}-doc -%doc doc/build/html -%license LICENSE - - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* - - - -%changelog -* Thu Aug 16 2018 RDO 1.1.1-1 -- Update to 1.1.1 - diff --git a/openstack/python-muranoclient/centos/python-muranoclient.spec.orig b/openstack/python-muranoclient/centos/python-muranoclient.spec.orig deleted file mode 100644 index 7addcb9e..00000000 --- a/openstack/python-muranoclient/centos/python-muranoclient.spec.orig +++ /dev/null @@ -1,182 +0,0 @@ -%global pypi_name muranoclient - -%if 0%{?fedora} -%global with_python3 0 -%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')} -%endif - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global common_desc \ -Client library for Murano built on the Murano API. It provides a Python \ -API (the muranoclient module) and a command-line tool (murano). - -Name: python-%{pypi_name} -Version: 1.1.1 -Release: 1%{?dist} -Summary: Client library for OpenStack Murano API - -License: ASL 2.0 -URL: http://pypi.python.org/pypi/%{name} -Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - -%description -%{common_desc} - -%package -n python2-%{pypi_name} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pbr >= 2.0.0 - -Requires: python2-babel >= 2.3.4 -Requires: python2-glanceclient >= 1:2.8.0 -Requires: python2-iso8601 >= 0.1.11 -Requires: python2-keystoneclient >= 1:3.8.0 -Requires: python2-murano-pkg-check >= 0.3.0 -Requires: python2-pbr >= 2.0.0 -Requires: python2-prettytable >= 0.7.2 -Requires: python2-requests >= 2.14.2 -Requires: python2-six >= 1.10.0 -Requires: python2-yaql >= 1.1.3 -Requires: python2-osc-lib >= 1.10.0 -Requires: python2-oslo-log >= 3.36.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-pyOpenSSL >= 16.2.0 -%if 0%{?fedora} > 0 -Requires: python2-pyyaml >= 3.10 -%else -Requires: PyYAML >= 3.10 -%endif - -Summary: Client library for OpenStack Murano API. -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -%{common_desc} - -# Python3 package -%if 0%{?with_python3} -%package -n python3-%{pypi_name} -Summary: Support of EC2 API for OpenStack -%{?python_provide:%python_provide python3-%{pypi_name}} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python-tools - -Requires: python3-babel >= 2.3.4 -Requires: python3-glanceclient >= 1:2.8.0 -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-keystoneclient >= 1:3.8.0 -Requires: python3-murano-pkg-check >= 0.3.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-prettytable >= 0.7.2 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-yaql >= 1.1.3 -Requires: python3-osc-lib >= 1.10.0 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pyOpenSSL >= 16.2.0 -Requires: python3-PyYAML >= 3.10 - -%description -n python3-%{pypi_name} -%{common_desc} -%endif - -# Documentation package -%package -n python-%{pypi_name}-doc -Summary: Documentation for OpenStack Murano API Client - -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme - -%description -n python-%{pypi_name}-doc -Documentation for the client library for interacting with Openstack -Murano API. - -%prep -%autosetup -n %{name}-%{upstream_version} -S git -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info -# Let RPM handle the dependencies -%py_req_cleanup - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -2to3 --write --nobackups %{py3dir} -%endif - -%build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py build -popd -%endif - -# generate html docs -export PYTHONPATH=. -sphinx-build -W -b html doc/source doc/build/html -# remove the sphinx-build leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -%if 0%{?with_python3} -pushd %{py3dir} -LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot} -mv %{buildroot}%{_bindir}/murano %{buildroot}%{_bindir}/python3-murano -popd -%endif - -%{__python2} setup.py install --skip-build --root %{buildroot} - -# rename binaries, make compat symlinks -pushd %{buildroot}%{_bindir} -%if 0%{?with_python3} -for i in %{pypi_name}-{3,%{?python3_shortver}}; do - ln -s python3-%{pypi_name} $i -done -%endif -popd - -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info -%{_bindir}/murano* - -# Files for python3 -%if 0%{?with_python3} -%files -n python3-%{pypi_name} -%license LICENSE -%doc README.rst -%{_bindir}/python3-murano -%{_bindir}/murano* -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/python_%{pypi_name}-%{version}-py?.?.egg-info -%endif - -%files -n python-%{pypi_name}-doc -%doc doc/build/html -%license LICENSE - -%changelog -* Thu Aug 16 2018 RDO 1.1.1-1 -- Update to 1.1.1 -