From 16f32dac21396222dd23969921139bdeaea43d76 Mon Sep 17 00:00:00 2001
From: matthew-fuller <mfuller@suse.com>
Date: Fri, 4 Oct 2019 20:07:37 -0700
Subject: [PATCH] Update congressclient for python3

Change-Id: I912fc9137df182a5cb5c2246d0ac6169e789b08f
---
 .../python-congressclient.spec.j2             | 68 ++++++++-----------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/openstack/python-congressclient/python-congressclient.spec.j2 b/openstack/python-congressclient/python-congressclient.spec.j2
index aa98aab5c..37da3fb2e 100644
--- a/openstack/python-congressclient/python-congressclient.spec.j2
+++ b/openstack/python-congressclient/python-congressclient.spec.j2
@@ -1,42 +1,35 @@
-%global sname python-congressclient
 {% set pypi_name = 'python-congressclient' %}
 {% set upstream_version = upstream_version('1.13.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
-Name:           {{ py2name() }}
+Name:           {{ py2name(py_versions='py3') }}
 Version:        {{ py2rpmversion() }}
 Release:        {{ py2rpmrelease() }}
 Summary:        Client library for Congress
 License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
-URL:            https://launchpad.net/%{name}
+URL:            https://launchpad.net/{{ pypi_name }}
 Source0:        {{ source }}
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('fixtures') }}
-BuildRequires:  {{ py2pkg('jsonpatch') }}
-BuildRequires:  {{ py2pkg('mock') }}
-BuildRequires:  {{ py2pkg('osc-lib') }}
-BuildRequires:  {{ py2pkg('oslo.log') }}
-BuildRequires:  {{ py2pkg('oslo.serialization') }}
-BuildRequires:  {{ py2pkg('oslo.utils') }}
-BuildRequires:  {{ py2pkg('oslotest') }}
-BuildRequires:  {{ py2pkg('pbr') }}
-BuildRequires:  {{ py2pkg('python-subunit') }}
-BuildRequires:  {{ py2pkg('requests-mock') }}
-BuildRequires:  {{ py2pkg('setuptools') }}
-BuildRequires:  {{ py2pkg('sphinxcontrib-apidoc') }}
-BuildRequires:  {{ py2pkg('stestr') }}
-BuildRequires:  {{ py2pkg('testscenarios') }}
-Requires:       {{ py2pkg('Babel') }}
-Requires:       {{ py2pkg('cliff') }}
-Requires:       {{ py2pkg('keystoneauth1') }}
-Requires:       {{ py2pkg('oslo.i18n') }}
-Requires:       {{ py2pkg('oslo.log') }}
-Requires:       {{ py2pkg('oslo.serialization') }}
-Requires:       {{ py2pkg('oslo.utils') }}
-Requires:       {{ py2pkg('pbr') }}
-Requires:       {{ py2pkg('requests') }}
-Requires:       {{ py2pkg('six') }}
+BuildRequires:  {{ py3('fixtures') }}
+BuildRequires:  {{ py3('mock') }}
+BuildRequires:  {{ py3('osc-lib') }}
+BuildRequires:  {{ py3('oslo.log') }}
+BuildRequires:  {{ py3('oslo.serialization') }}
+BuildRequires:  {{ py3('oslotest') }}
+BuildRequires:  {{ py3('pbr') }}
+BuildRequires:  {{ py3('requests-mock') }}
+BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
+BuildRequires:  {{ py3('stestr') }}
+Requires:       {{ py3('Babel') }}
+Requires:       {{ py3('cliff') }}
+Requires:       {{ py3('keystoneauth1') }}
+Requires:       {{ py3('oslo.i18n') }}
+Requires:       {{ py3('oslo.log') }}
+Requires:       {{ py3('oslo.serialization') }}
+Requires:       {{ py3('pbr') }}
+Requires:       {{ py3('requests') }}
+Requires:       {{ py3('six') }}
 BuildArch:      noarch
 
 %description
@@ -52,9 +45,8 @@ is designed to work with any policy and any cloud service.
 %package doc
 Summary:        Documentation for OpenStack Congress API client libary
 Group:          Documentation/HTML
-BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('reno') }}
+BuildRequires:  {{ py3('Sphinx') }}
+BuildRequires:  {{ py3('openstackdocstheme') }}
 
 %description doc
 This package is client for Congress component.
@@ -68,27 +60,27 @@ is designed to work with any policy and any cloud service.
 This package contains the documentation.
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -p1 -n {{ pypi_name }}-%{version}
 %py_req_cleanup
 
 %build
-%{py2_build}
+%{py3_build}
 
 # Build HTML docs and man page
-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
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install
-%{py2_install}
+%{py3_install}
 
 %check
-stestr run
+%{__python3} -m stestr.cli run
 
 %files
 %doc README.rst
 %license LICENSE
-%{python2_sitelib}/congressclient
-%{python2_sitelib}/*.egg-info
+%{python3_sitelib}/congressclient
+%{python3_sitelib}/*.egg-info
 
 %files doc
 %doc doc/build/html