openstack
/
sahara
Code Issues Proposed changes

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: I117657e9861a55a751522dba3e3b1e75a22f9711
This commit is contained in:
zhangbailin 2022-06-09 14:07:25 +08:00 committed by Brin Zhang
parent 9db0ee2b3c
commit 0281a77cda
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lower-constraints.txt
View File

@ -70,13 +70,13 @@ oslo.concurrency==3.26.0
oslo.config==6.8.0
oslo.context==2.22.0
oslo.db==6.0.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.i18n==3.20.0
oslo.log==5.0.0
oslo.messaging==10.2.0
oslo.middleware==3.31.0
oslo.policy==3.6.0
oslo.rootwrap==5.8.0
oslo.serialization==2.18.0
oslo.serialization==2.25.0
oslo.service==1.31.0
oslo.upgradecheck==1.3.0
oslo.utils==4.5.0
@ -85,7 +85,7 @@ packaging==20.4
paramiko==2.7.1
Paste==2.0.3
PasteDeploy==1.5.2
pbr==2.0.0
pbr==3.1.1
pika-pool==0.1.3
pika==0.10.0
prettytable==0.7.2

8
requirements.txt
View File

@ -2,7 +2,7 @@
# 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
alembic>=0.9.6 # MIT
botocore>=1.5.1 # Apache-2.0
@ -19,13 +19,13 @@ oslo.config>=6.8.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0
oslo.db>=6.0.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.i18n>=3.20.0 # Apache-2.0
oslo.log>=5.0.0 # Apache-2.0
oslo.messaging>=10.2.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0
oslo.policy>=3.6.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.serialization>=2.25.0 # Apache-2.0
oslo.service>=1.31.0 # Apache-2.0
oslo.upgradecheck>=1.3.0 # Apache-2.0
oslo.utils>=4.5.0 # Apache-2.0