summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranguoming <agm_daydayup@foxmail.com>2022-06-13 16:37:38 +0800
committeranguoming <agm_daydayup@foxmail.com>2022-07-05 16:45:02 +0800
commit889950618fb34c42bd38bb8a68bb1c680d6cefd1 (patch)
treeb27832b40f348da19e0b9f5d564d0c946ec96de2
parentab12ce32a4a77268ff35b719fab415498fc0827b (diff)
downloadpython-saharaclient-889950618fb34c42bd38bb8a68bb1c680d6cefd1.tar.gz
Bump oslo.* and pbr version to support >=py38
In zed cycle, OpenStack projects and oslo lib has dropped the py3.6 and py3.7 support - https://governance.openstack.org/tc/reference/runtimes/zed.html I also decrepated oslo-log < 5.0.0, so we should bump oslo.log>=5.0.0. Because of oslo.log>=5.0.0 depends on oslo.i18n>=3.20.0 as below, so we also need to upgrade oslo.i18n. The conflict is caused by: The user requested oslo.i18n>=3.15.3 python-saharaclient 1.4.0 depends on oslo.i18n>=3.15.3 castellan 0.16.0 depends on oslo.i18n>=3.15.3 keystonemiddleware 4.17.0 depends on oslo.i18n!=3.15.2 and >=2.1.0 oslo-config 6.8.0 depends on oslo.i18n>=3.15.3 oslo-concurrency 3.26.0 depends on oslo.i18n>=3.15.3 oslo-db 6.0.0 depends on oslo.i18n>=3.15.3 oslo-log 5.0.0 depends on oslo.i18n>=3.20.0 The user requested (constraint) oslo-i18n==3.15.3 The conflict is caused by: The user requested pbr!=2.1.0 and >=2.0.0 bashate 0.5.1 depends on pbr>=1.6 fixtures 3.0.0 depends on pbr>=0.11 stestr 1.0.0 depends on pbr!=2.1.0 and >=2.0.0 testresources 2.0.0 depends on pbr>=1.8 testtools 2.4.0 depends on pbr>=0.11 python-saharaclient 1.4.0 depends on pbr!=2.1.0 and >=2.0.0 castellan 0.16.0 depends on pbr!=2.1.0 and >=2.0.0 keystoneauth1 3.4.0 depends on pbr!=2.1.0 and >=2.0.0 keystonemiddleware 4.17.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-concurrency 3.26.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-context 2.22.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-db 6.0.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-i18n 3.20.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-log 5.0.0 depends on pbr>=3.1.1 The user requested (constraint) pbr==2.0.0 The conflict is caused by: The user requested oslo.serialization!=2.19.1 and >=2.18.0 python-saharaclient 1.4.0 depends on oslo.serialization!=2.19.1 and >=2.18.0 keystonemiddleware 4.17.0 depends on oslo.serialization!=2.19.1 and >=1.10.0 oslo-log 5.0.0 depends on oslo.serialization>=2.25.0 The user requested (constraint) oslo-serialization==2.18.0 Change-Id: Iebd0c795dcdd72dac1141cfe18d2dad5201147c1
-rw-r--r--requirements.txt8
-rw-r--r--tox.ini4
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt
index b0bcfcf..dc256aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,13 +2,13 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+pbr>=3.1.1 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0
osc-lib>=2.0.0 # Apache-2.0
-oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-oslo.i18n>=3.15.3 # Apache-2.0
+oslo.log>=5.0.0 # Apache-2.0
+oslo.serialization>=2.25.0 # Apache-2.0
+oslo.i18n>=3.20.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
python-openstackclient>=5.2.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 9be7edc..c1d0ee3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,8 +27,8 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
basepython = python3
commands = oslo_debug_helper -t saharaclient/tests/unit {posargs}
-[testenv:debug-py36]
-basepython = python3.6
+[testenv:debug-py38]
+basepython = python3.8
commands = oslo_debug_helper -t saharaclient/tests/unit {posargs}
[testenv:cover]