openstack/requirements
Code Issues Proposed changes

switch from py36/38 to py38/39

Browse Source 
Change-Id: Idd24975afb969a9b182be9034bee4d4b019ac32b
Signed-off-by: Matthew Thode <mthode@mthode.org>
This commit is contained in:
Matthew Thode 2022-04-13 20:05:09 -05:00
parent 7b88d6e8c5
commit 53f1cd32d2
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.zuul.d/jobs.yaml
View File

@ -12,16 +12,6 @@
vars: vars:
tox_envlist: babel tox_envlist: babel
- job:
name: requirements-tox-py36-check-uc
parent: openstack-tox-py36
description: |
Run test for requirements project.
Uses tox with the ``py36-check-uc`` environment.
files: ^upper-constraints.*txt$
vars:
tox_envlist: py36-check-uc
- job: - job:
name: requirements-tox-py38-check-uc name: requirements-tox-py38-check-uc
parent: openstack-tox-py38 parent: openstack-tox-py38
@ -32,6 +22,16 @@
files: ^upper-constraints.*txt$ files: ^upper-constraints.*txt$
vars: vars:
tox_envlist: py38-check-uc tox_envlist: py38-check-uc
- job:
name: requirements-tox-py39-check-uc
parent: openstack-tox-py39
description: |
Run test for requirements project.
Uses tox with the ``py39-check-uc`` environment.
files: ^upper-constraints.*txt$
vars:
tox_envlist: py39-check-uc
- job: - job:
name: requirements-tox-validate-projects name: requirements-tox-validate-projects
parent: openstack-tox parent: openstack-tox

8
.zuul.d/project.yaml
View File

@ -25,8 +25,8 @@
- requirements-tox-babel - requirements-tox-babel
- requirements-tox-bindep: - requirements-tox-bindep:
voting: false voting: false
- requirements-tox-py36-check-uc
- requirements-tox-py38-check-uc - requirements-tox-py38-check-uc
- requirements-tox-py39-check-uc
- requirements-tox-validate-projects: - requirements-tox-validate-projects:
voting: false voting: false
- cross-barbican-py38 - cross-barbican-py38
@ -50,7 +50,7 @@
- cross-octavia-py38 - cross-octavia-py38
- cross-osc-tox-docs - cross-osc-tox-docs
- cross-swift-py38 - cross-swift-py38
- openstack-tox-py36 - openstack-tox-py38
- openstacksdk-functional-devstack - openstacksdk-functional-devstack
- tempest-full-py3: - tempest-full-py3:
irrelevant-files: irrelevant-files:
@ -96,8 +96,8 @@
- bindep.txt - bindep.txt
- openstack-tox-validate - openstack-tox-validate
- requirements-tox-babel - requirements-tox-babel
- requirements-tox-py36-check-uc
- requirements-tox-py38-check-uc - requirements-tox-py38-check-uc
- requirements-tox-py39-check-uc
- cross-cinder-py38 - cross-cinder-py38
- cross-designate-py38 - cross-designate-py38
- cross-glance-py38 - cross-glance-py38
@ -120,7 +120,7 @@
- cross-octavia-py38 - cross-octavia-py38
- cross-osc-tox-docs - cross-osc-tox-docs
- cross-swift-py38 - cross-swift-py38
- openstack-tox-py36 - openstack-tox-py38
- openstacksdk-functional-devstack - openstacksdk-functional-devstack
- tempest-full-py3: - tempest-full-py3:
irrelevant-files: irrelevant-files:

2
setup.cfg
View File

@ -19,6 +19,8 @@ classifier =
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
[files] [files]
packages = packages =

10
tox.ini
View File

@ -13,13 +13,13 @@ deps = -c{toxinidir}/upper-constraints.txt
commands = commands =
stestr run {posargs} stestr run {posargs}
[testenv:py36-check-uc] [testenv:py38-check-uc]
basepython = python3.6 basepython = python3.8
deps = -r{toxinidir}/upper-constraints.txt deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
[testenv:py38-check-uc] [testenv:py39-check-uc]
basepython = python3.8 basepython = python3.9
deps = -r{toxinidir}/upper-constraints.txt deps = -r{toxinidir}/upper-constraints.txt
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
@ -34,7 +34,7 @@ description = Regenerates upper-constraints.txt
# Generate needs an unconstrained install to get new dependencies # Generate needs an unconstrained install to get new dependencies
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.6 -p python3.7 -p python3.8 -p python3.9 > upper-constraints.txt} commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.6 -p python3.7 -p python3.8 -p python3.9 -p python3.10 > upper-constraints.txt}
[testenv:validate] [testenv:validate]
commands = commands =