diff --git a/openstack/python-barbicanclient/python-barbicanclient.spec.j2 b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
index 0d97eb5dc..183cb7757 100644
--- a/openstack/python-barbicanclient/python-barbicanclient.spec.j2
+++ b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-barbicanclient' %}
-{% set upstream_version = upstream_version('4.10.0') %}
+{% set upstream_version = upstream_version('5.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2
index ac2698b4b..e4521ced1 100644
--- a/openstack/python-cinderclient/python-cinderclient.spec.j2
+++ b/openstack/python-cinderclient/python-cinderclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-cinderclient' %}
-{% set upstream_version = upstream_version('7.0.0') %}
+{% set upstream_version = upstream_version('7.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -72,6 +72,7 @@ This package contains auto-generated documentation.
 %build
 %{py3_build}
 
+export PYTHONPATH=.
 PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/html
 PBR_VERSION={{ upstream_version }} %sphinx_build -b man doc/source doc/build/man
 # remove the sphinx-build leftovers
diff --git a/openstack/python-freezerclient/python-freezerclient.spec.j2 b/openstack/python-freezerclient/python-freezerclient.spec.j2
index c480da841..37fa9d172 100644
--- a/openstack/python-freezerclient/python-freezerclient.spec.j2
+++ b/openstack/python-freezerclient/python-freezerclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-freezerclient' %}
-{% set upstream_version = upstream_version('3.0.1') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-glanceclient/python-glanceclient.spec.j2 b/openstack/python-glanceclient/python-glanceclient.spec.j2
index 681f27a9d..b82c9101d 100644
--- a/openstack/python-glanceclient/python-glanceclient.spec.j2
+++ b/openstack/python-glanceclient/python-glanceclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-glanceclient' %}
-{% set upstream_version = upstream_version('3.1.1') %}
+{% set upstream_version = upstream_version('3.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -14,6 +14,7 @@ URL:            https://launchpad.net/{{ pypi_name }}
 Source0:        {{ source }}
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('PrettyTable') }}
+BuildRequires:  {{ py3('ddt') }}
 BuildRequires:  {{ py3('fixtures') }}
 BuildRequires:  {{ py3('python-keystoneclient') }}
 BuildRequires:  {{ py3('mock') }}
diff --git a/openstack/python-heatclient/python-heatclient.spec.j2 b/openstack/python-heatclient/python-heatclient.spec.j2
index 2eef5748d..583097061 100644
--- a/openstack/python-heatclient/python-heatclient.spec.j2
+++ b/openstack/python-heatclient/python-heatclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-heatclient' %}
-{% set upstream_version = upstream_version('2.1.0') %}
+{% set upstream_version = upstream_version('2.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
index 202f86174..6ca8f4e68 100644
--- a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
+++ b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-ironic-inspector-client' %}
-{% set upstream_version = upstream_version('4.1.0') %}
+{% set upstream_version = upstream_version('4.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
index e90370a5f..554bb6d13 100644
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-keystoneclient' %}
-{% set upstream_version = upstream_version('4.0.0') %}
+{% set upstream_version = upstream_version('4.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -54,6 +54,7 @@ Summary:        Documentation for OpenStack Identity API Client
 Group:          Documentation/HTML
 BuildRequires:  {{ py3('Sphinx') }}
 BuildRequires:  {{ py3('openstackdocstheme') }}
+BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 
 %description -n python-keystoneclient-doc
 Documentation for the client library for interacting with Openstack
diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2
index b3fbfc53e..a5b16925f 100644
--- a/openstack/python-manilaclient/python-manilaclient.spec.j2
+++ b/openstack/python-manilaclient/python-manilaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-manilaclient' %}
-{% set upstream_version = upstream_version('2.1.0') %}
+{% set upstream_version = upstream_version('2.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2
index 55116deff..a55461ff2 100644
--- a/openstack/python-masakariclient/python-masakariclient.spec.j2
+++ b/openstack/python-masakariclient/python-masakariclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-masakariclient' %}
-{% set upstream_version = upstream_version('6.0.0') %}
+{% set upstream_version = upstream_version('6.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2
index 31a86aa65..a132be174 100644
--- a/openstack/python-mistralclient/python-mistralclient.spec.j2
+++ b/openstack/python-mistralclient/python-mistralclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-mistralclient' %}
-{% set upstream_version = upstream_version('4.0.1') %}
+{% set upstream_version = upstream_version('4.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-monascaclient/python-monascaclient.spec.j2 b/openstack/python-monascaclient/python-monascaclient.spec.j2
index f512e5904..d01f35408 100644
--- a/openstack/python-monascaclient/python-monascaclient.spec.j2
+++ b/openstack/python-monascaclient/python-monascaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-monascaclient' %}
-{% set upstream_version = upstream_version('2.1.0') %}
+{% set upstream_version = upstream_version('2.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-muranoclient/python-muranoclient.spec.j2 b/openstack/python-muranoclient/python-muranoclient.spec.j2
index b3d1fa525..392f781a4 100644
--- a/openstack/python-muranoclient/python-muranoclient.spec.j2
+++ b/openstack/python-muranoclient/python-muranoclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-muranoclient' %}
-{% set upstream_version = upstream_version('2.0.1') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-novaclient/python-novaclient.spec.j2 b/openstack/python-novaclient/python-novaclient.spec.j2
index 3ebfae922..09f5a6ee1 100644
--- a/openstack/python-novaclient/python-novaclient.spec.j2
+++ b/openstack/python-novaclient/python-novaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-novaclient' %}
-{% set upstream_version = upstream_version('17.0.0') %}
+{% set upstream_version = upstream_version('17.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-octaviaclient/python-octaviaclient.spec.j2 b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
index 53d72306b..7f2f4faab 100644
--- a/openstack/python-octaviaclient/python-octaviaclient.spec.j2
+++ b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-octaviaclient' %}
-{% set upstream_version = upstream_version('2.0.1') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-qinlingclient/python-qinlingclient.spec.j2 b/openstack/python-qinlingclient/python-qinlingclient.spec.j2
index ca2336f94..38600877e 100644
--- a/openstack/python-qinlingclient/python-qinlingclient.spec.j2
+++ b/openstack/python-qinlingclient/python-qinlingclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-qinlingclient' %}
-{% set upstream_version = upstream_version('5.0.1') %}
+{% set upstream_version = upstream_version('5.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-saharaclient/python-saharaclient.spec.j2 b/openstack/python-saharaclient/python-saharaclient.spec.j2
index 59726dbb2..3aef3f42d 100644
--- a/openstack/python-saharaclient/python-saharaclient.spec.j2
+++ b/openstack/python-saharaclient/python-saharaclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-saharaclient' %}
-{% set upstream_version = upstream_version('3.1.0') %}
+{% set upstream_version = upstream_version('3.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-senlinclient/python-senlinclient.spec.j2 b/openstack/python-senlinclient/python-senlinclient.spec.j2
index 81c38fa31..f560a7ab5 100644
--- a/openstack/python-senlinclient/python-senlinclient.spec.j2
+++ b/openstack/python-senlinclient/python-senlinclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-senlinclient' %}
-{% set upstream_version = upstream_version('2.0.1') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-solumclient/python-solumclient.spec.j2 b/openstack/python-solumclient/python-solumclient.spec.j2
index f7dd9fb26..19ec84b92 100644
--- a/openstack/python-solumclient/python-solumclient.spec.j2
+++ b/openstack/python-solumclient/python-solumclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-solumclient' %}
-{% set upstream_version = upstream_version('3.1.0') %}
+{% set upstream_version = upstream_version('3.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-swiftclient/python-swiftclient.spec.j2 b/openstack/python-swiftclient/python-swiftclient.spec.j2
index 360dc17f9..a7de9f92d 100644
--- a/openstack/python-swiftclient/python-swiftclient.spec.j2
+++ b/openstack/python-swiftclient/python-swiftclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-swiftclient' %}
-{% set upstream_version = upstream_version('3.9.0') %}
+{% set upstream_version = upstream_version('3.10.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-tackerclient/python-tackerclient.spec.j2 b/openstack/python-tackerclient/python-tackerclient.spec.j2
index 8b891c528..4a9856a58 100644
--- a/openstack/python-tackerclient/python-tackerclient.spec.j2
+++ b/openstack/python-tackerclient/python-tackerclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-tackerclient' %}
-{% set upstream_version = upstream_version('1.1.0') %}
+{% set upstream_version = upstream_version('1.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/python-vitrageclient/python-vitrageclient.spec.j2 b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
index 79cfa680a..256bc04b4 100644
--- a/openstack/python-vitrageclient/python-vitrageclient.spec.j2
+++ b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-vitrageclient' %}
-{% set upstream_version = upstream_version('4.0.1') %}
+{% set upstream_version = upstream_version('4.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 %if 0%{?suse_version}
diff --git a/openstack/python-watcherclient/python-watcherclient.spec.j2 b/openstack/python-watcherclient/python-watcherclient.spec.j2
index 94b110540..e3cee94a3 100644
--- a/openstack/python-watcherclient/python-watcherclient.spec.j2
+++ b/openstack/python-watcherclient/python-watcherclient.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'python-watcherclient' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}