From 4602eee943f0dba286477784ec7d362c6c2e3146 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 21 May 2020 18:46:52 -0500
Subject: [PATCH] Cap few deps of keystoneauth for py3.5

Few branchless projects like Keystoneauth, OpenStackSDK etc
keeping the support of py3.5 and have voting py3.5 job.

To fix the currently failing py3.5 job on keystonauth,
we need to have kesutoneauth deps cap for < py3.6. We need to keep it
until we completely drop py3.5 from OpenStack.
- https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html#projects-keeping-py3-5-support

Change-Id: Idbf8b76c2d53b61def7dc086e785e383c4e7e1db
---
 global-requirements.txt | 20 ++++++++++++++------
 upper-constraints.txt   | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 8df249ccf2..f9a5b1c4b9 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -34,7 +34,8 @@ cryptography!=2.0  # BSD/Apache-2.0
 cursive  # Apache-2.0
 dataclasses;python_version=='3.6'  # Apache-2.0
 ddt  # MIT
-debtcollector  # Apache-2.0
+debtcollector<2.0.0;python_version<'3.6'  # Apache-2.0
+debtcollector;python_version>='3.6'  # Apache-2.0
 decorator  # BSD
 defusedxml  # PSF
 dib-utils  # Apache-2.0
@@ -137,11 +138,14 @@ openstackdocstheme!=2.1.0,!=2.1.1  # Apache-2.0
 osc-lib  # Apache-2.0
 osc-placement  # Apache-2.0
 oslo.cache!=1.31.1,!=2.1.0  # Apache-2.0
-oslo.config!=4.3.0,!=4.4.0  # Apache-2.0
+oslo.config!=4.3.0,!=4.4.0,<8.0.0;python_version<'3.6'  # Apache-2.0
+oslo.config!=4.3.0,!=4.4.0;python_version>='3.6'  # Apache-2.0
 oslo.concurrency  # Apache-2.0
 oslo.context  # Apache-2.0
 oslo.db  # Apache-2.0
 oslo.i18n  # Apache-2.0
+oslo.i18n<4.0.0;python_version<'3.6'  # Apache-2.0
+oslo.i18n;python_version>='3.6'  # Apache-2.0
 oslo.limit  # Apache-2.0
 oslo.log  # Apache-2.0
 oslo.messaging!=9.0.0  # Apache-2.0
@@ -155,7 +159,8 @@ oslo.serialization!=2.19.1  # Apache-2.0
 oslo.service!=1.28.1  # Apache-2.0
 oslo.upgradecheck  # Apache-2.0
 # NOTE(lajoskatona): oslo.utils version between 3.39.1 and 3.40.1 excluded due to bug 1812922
-oslo.utils!=3.39.1,!=3.40.0,!=3.40.1  # Apache-2.0
+oslo.utils!=3.39.1,!=3.40.0,!=3.40.1,<4.0.0;python_version<'3.6'  # Apache-2.0
+oslo.utils!=3.39.1,!=3.40.0,!=3.40.1;python_version>='3.6'  # Apache-2.0
 oslo.vmware  # Apache-2.0
 oslo.versionedobjects  # Apache-2.0
 osprofiler  # Apache-2.0
@@ -287,7 +292,8 @@ python-dateutil  # BSD
 pytz  # MIT
 pyudev  # LGPLv2.1+
 PyYAML  # MIT
-reno  # Apache-2.0
+reno<3;python_version<'3.6'  # Apache-2.0
+reno;python_version>='3.6'  # Apache-2.0
 requests!=2.20.0  # Apache-2.0
 requests-aws  # BSD License (3 clause)
 requests-kerberos  # ISC
@@ -401,7 +407,8 @@ ldappool  # MPL
 # https://github.com/testing-cabal/mock/issues/487  for 4.0.[0-1] blacklist
 mock!=4.0.0,!=4.0.1  # BSD
 mox  # Apache-2.0
-mox3  # Apache-2.0
+mox3<1;python_version<'3.6'  # Apache-2.0
+mox3;python_version>='3.6'  # Apache-2.0
 nodeenv  # BSD
 nose  # LGPL
 nose-exclude  # LGPL
@@ -412,7 +419,8 @@ openstack.nose-plugin  # Apache-2.0
 openstacksdk  # Apache-2.0
 os-api-ref  # Apache-2.0
 oslosphinx  # Apache-2.0
-oslotest  # Apache-2.0
+oslotest<4;python_version<'3.6'  # Apache-2.0
+oslotest;python_version>='3.6'  # Apache-2.0
 ovsdbapp  # Apache-2.0
 proboscis  # Apache-2.0
 psycopg2  # LGPL/ZPL
diff --git a/upper-constraints.txt b/upper-constraints.txt
index f81f232f6d..1a1455e9a0 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -45,7 +45,10 @@ waiting===1.4.1
 attrs===19.3.0
 microversion-parse===1.0.1
 Pint===0.11
-oslo.i18n===4.0.1
+oslo.i18n===3.25.1;python_version=='3.5'
+oslo.i18n===4.0.1;python_version=='3.6'
+oslo.i18n===4.0.1;python_version=='3.7'
+oslo.i18n===4.0.1;python_version=='3.8'
 jsonpath-rw-ext===1.2.2
 python-mistralclient===4.0.1
 oslo.context===3.0.2
@@ -107,7 +110,10 @@ XStatic-Jasmine===2.4.1.2
 googleapis-common-protos===1.51.0
 python-glanceclient===3.1.1
 pyinotify===0.9.6
-debtcollector===2.0.1
+debtcollector===1.22.0;python_version=='3.5'
+debtcollector===2.0.1;python_version=='3.6'
+debtcollector===2.0.1;python_version=='3.7'
+debtcollector===2.0.1;python_version=='3.8'
 requests-unixsocket===0.2.0
 croniter===0.3.31
 octavia-lib===2.0.0
@@ -119,7 +125,10 @@ pymongo===3.10.1
 python-cloudkittyclient===4.0.0
 soupsieve===2.0.1
 sqlparse===0.3.1
-oslotest===4.2.0
+oslotest===3.9.0;python_version=='3.5'
+oslotest===4.2.0;python_version=='3.6'
+oslotest===4.2.0;python_version=='3.7'
+oslotest===4.2.0;python_version=='3.8'
 jsonpointer===2.0
 defusedxml===0.6.0
 netaddr===0.7.19
@@ -155,7 +164,10 @@ XStatic-lodash===4.16.4.1
 zVMCloudConnector===1.4.1
 paramiko===2.7.1
 ifaddr===0.1.6
-reno===3.1.0
+reno===2.11.3;python_version=='3.5'
+reno===3.1.0;python_version=='3.6'
+reno===3.1.0;python_version=='3.7'
+reno===3.1.0;python_version=='3.8'
 imagesize===1.2.0
 pydot===1.4.1
 urllib3===1.25.9
@@ -183,7 +195,10 @@ requests-mock===1.8.0
 os-apply-config===11.1.0
 prometheus-client===0.7.1
 oslosphinx===4.18.0
-mox3===1.0.0
+mox3===0.28.0;python_version=='3.5'
+mox3===1.0.0;python_version=='3.6'
+mox3===1.0.0;python_version=='3.7'
+mox3===1.0.0;python_version=='3.8'
 gunicorn===20.0.4
 storpool===5.4.0
 textfsm===1.1.0
@@ -379,7 +394,10 @@ seqdiag===2.0.0
 numpy===1.18.4
 msgpack===0.6.1
 Sphinx===3.0.3
-oslo.config===8.0.2
+oslo.config===7.0.0;python_version=='3.5'
+oslo.config===8.0.2;python_version=='3.6'
+oslo.config===8.0.2;python_version=='3.7'
+oslo.config===8.0.2;python_version=='3.8'
 tempest===24.0.0
 openstackdocstheme===2.2.1
 osc-placement===2.0.0
@@ -543,7 +561,10 @@ filelock===3.0.12
 python-tackerclient===1.1.0
 python-heatclient===2.1.0
 kafka-python===2.0.1
-oslo.utils===4.1.1
+oslo.utils===3.42.1;python_version=='3.5'
+oslo.utils===4.1.1;python_version=='3.6'
+oslo.utils===4.1.1;python_version=='3.7'
+oslo.utils===4.1.1;python_version=='3.8'
 python-editor===1.0.4
 gitdb2===4.0.2
 requests-kerberos===0.12.0