From a898593646181f65fa16cd2f8417a474ca5560c0 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Nov 06 2019 16:01:54 +0000
Subject: Sync from RDO train release


---

diff --git a/.gitignore b/.gitignore
index 1a7c5b2..34f9467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /os-service-types-1.1.0.tar.gz
 /os-service-types-1.6.0.tar.gz
+/os-service-types-1.7.0.tar.gz
diff --git a/python-os-service-types.spec b/python-os-service-types.spec
index e4b4daa..947ba33 100644
--- a/python-os-service-types.spec
+++ b/python-os-service-types.spec
@@ -1,7 +1,20 @@
+# Macros for py2/py3 compatibility
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global pyver %{python3_pkgversion}
+%else
+%global pyver 2
+%endif
+%global pyver_bin python%{pyver}
+%global pyver_sitelib %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
+
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global pypi_name os-service-types
 %global module_name os_service_types
 
+# Needed for train bootstrap
 %global repo_bootstrap 1
 
 %global common_desc \
@@ -16,8 +29,8 @@ and local caching of the fetched data.
 %global with_doc 1
 
 Name:           python-%{pypi_name}
-Version:        1.6.0
-Release:        5%{?dist}
+Version:        1.7.0
+Release:        2%{?dist}
 Summary:        Python library for consuming OpenStack sevice-types-authority data
 
 License:        ASL 2.0
@@ -30,31 +43,32 @@ BuildRequires:  git
 %description
 %{common_desc}
 
-%package -n     python3-%{pypi_name}
+%package -n     python%{pyver}-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-pbr
-BuildRequires:  python3-subunit
-BuildRequires:  python3-testscenarios
-BuildRequires:  python3-requests-mock
-BuildRequires:  python3-setuptools
+%{?python_provide:%python_provide python%{pyver}-%{pypi_name}}
+
+BuildRequires:  python%{pyver}-devel
+BuildRequires:  python%{pyver}-pbr
+BuildRequires:  python%{pyver}-subunit
+BuildRequires:  python%{pyver}-testscenarios
+BuildRequires:  python%{pyver}-setuptools
+BuildRequires:  python%{pyver}-requests-mock
+
 %if 0%{?repo_bootstrap} == 0
-BuildRequires:  python3-keystoneauth1
-BuildRequires:  python3-oslotest
+BuildRequires:  python%{pyver}-keystoneauth1
+BuildRequires:  python%{pyver}-oslotest
 %endif
 
-Requires:       python3-pbr >= 2.0.0
-%description -n python3-%{pypi_name}
+Requires:       python%{pyver}-pbr >= 2.0.0
+%description -n python%{pyver}-%{pypi_name}
 %{common_desc}
 
 %if 0%{?with_doc}
 %package -n python-%{pypi_name}-doc
 Summary:        %{pypi_name} documentation
 
-BuildRequires:  python3-openstackdocstheme
-BuildRequires:  python3-sphinx
+BuildRequires:  python%{pyver}-openstackdocstheme
+BuildRequires:  python%{pyver}-sphinx
 
 %description -n python-%{pypi_name}-doc
 %{common_desc}
@@ -71,30 +85,28 @@ rm -rf {test-,}requirements.txt
 rm -rf %{pypi_name}.egg-info
 
 %build
-%py3_build
+%{pyver_build}
 
 %if 0%{?with_doc}
 # generate html docs
-%{__python3} setup.py build_sphinx -b html
-# remove the sphinx-build-3 leftovers
+%{pyver_bin} setup.py build_sphinx -b html
+# remove the sphinx-build-%{pyver} leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %install
-%py3_install
-
+%{pyver_install}
 
 %check
 %if 0%{?repo_bootstrap} == 0
-%{__python3} setup.py test
-
+%{pyver_bin} setup.py test
 %endif
 
-%files -n python3-%{pypi_name}
+%files -n python%{pyver}-%{pypi_name}
 %license LICENSE
 %doc README.rst doc/source/readme.rst
-%{python3_sitelib}/%{module_name}
-%{python3_sitelib}/%{module_name}-%{upstream_version}-py?.?.egg-info
+%{pyver_sitelib}/%{module_name}
+%{pyver_sitelib}/%{module_name}-%{upstream_version}-py?.?.egg-info
 
 %if 0%{?with_doc}
 %files -n python-%{pypi_name}-doc
@@ -103,6 +115,9 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %changelog
+* Wed Nov 06 2019 Alfredo Moralejo <amoralej@redhat.com> 1.7.0-2
+- Update to upstream version 1.7.0
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.6.0-5
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index 05c596a..c556d90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-service-types-1.6.0.tar.gz) = 5269f54568304e038510542c5c29aefedb00449807a424426a03d450db6822b3c7d850da50b6804a9ee435298c0e56da31a031cdd09fc758780655f92de28662
+SHA512 (os-service-types-1.7.0.tar.gz) = d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57