From 2c528b97679f37a02623f822ae4524022c347ee2 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Sun, 29 Aug 2021 10:09:28 -0400 Subject: [PATCH] Adding py39 gate and removing py36 gates from zuul Adding py39 gate. Removing redundant py36 Zuul jobs since we now have py39 Zuul jobs in place with the debian nodeset Story: 2006796 Task: 42983 Change-Id: Ica95c7d5f91e7606c369fec2d06ec6f34cfd2796 Signed-off-by: Bernardo Decco --- .zuul.yaml | 15 ++++++++------- bindep.txt | 10 ++++++++++ distributedcloud-client/test-requirements.txt | 12 +++++++----- distributedcloud-client/tox.ini | 12 +++++++++++- 4 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 bindep.txt diff --git a/.zuul.yaml b/.zuul.yaml index 2611f4a..62b0a04 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,14 +9,14 @@ - openstack-tox-linters - stx-distcloud-client-tox-pep8 - stx-distcloud-client-tox-py27 - - stx-distcloud-client-tox-py36 + - stx-distcloud-client-tox-py39 - stx-distcloud-client-tox-pylint gate: jobs: - openstack-tox-linters - stx-distcloud-client-tox-pep8 - stx-distcloud-client-tox-py27 - - stx-distcloud-client-tox-py36 + - stx-distcloud-client-tox-py39 - stx-distcloud-client-tox-pylint post: jobs: @@ -32,12 +32,12 @@ tox_extra_args: -c distributedcloud-client/tox.ini - job: - name: stx-distcloud-client-tox-py36 - parent: tox - description: Run py36 for distcloud-client - nodeset: ubuntu-bionic + name: stx-distcloud-client-tox-py39 + parent: tox-py39 + description: Run py39 for distcloud-client + nodeset: ubuntu-focal vars: - tox_envlist: py36 + tox_envlist: py39 tox_extra_args: -c distributedcloud-client/tox.ini - job: @@ -52,6 +52,7 @@ name: stx-distcloud-client-tox-pep8 parent: tox description: Run pep8 for distcloud-client + nodeset: ubuntu-bionic vars: tox_envlist: pep8 tox_extra_args: -c distributedcloud-client/tox.ini diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..eb5ff12 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,10 @@ +# This is a cross-platform list tracking distribution packages needed for install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +libffi-dev [platform:dpkg] +libldap2-dev [platform:dpkg] +libxml2-dev [platform:dpkg] +libxslt1-dev [platform:dpkg] +libsasl2-dev [platform:dpkg] +libffi-devel [platform:rpm] +python3-all-dev [platform:ubuntu-focal] diff --git a/distributedcloud-client/test-requirements.txt b/distributedcloud-client/test-requirements.txt index 318fcc8..7369ef0 100644 --- a/distributedcloud-client/test-requirements.txt +++ b/distributedcloud-client/test-requirements.txt @@ -1,16 +1,18 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.1.0,<=2.0.0 # Apache-2.0 -isort<5;python_version>="3.0" +hacking!=0.13.0,<0.14,>=0.12.0 +astroid<= 2.2.5;python_version>="3.0" # GPLv2 +isort<5;python_version>="3.5" pylint<2.1.0;python_version<"3.0" # GPLv2 pylint<2.3.0;python_version>="3.0" # GPLv2 python-openstackclient>=3.3.0 # Apache-2.0 -sphinx>=1.5.1 # BSD +sphinx>=1.5.1;python_version<="3.6" # BSD +sphinx>=1.6.2;python_version>="3.6" # BSD fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0 # BSD -nose # LGPL tempest>=14.0.0 # Apache-2.0 testtools>=1.4.0 # MIT PyYAML>=3.1.0 -yamllint>=0.5.2 +yamllint<1.26.1;python_version>="3.0" # GPLv2 +python-dev-tools;python_version>="3.9" \ No newline at end of file diff --git a/distributedcloud-client/tox.ini b/distributedcloud-client/tox.ini index c426bb1..b25aa4c 100644 --- a/distributedcloud-client/tox.ini +++ b/distributedcloud-client/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.3 -envlist = py27,py36,pep8,pylint +envlist = py27,py36,py39,pep8,pylint skipsdist = True toxworkdir = /tmp/{env:USER}_dc_client_tox @@ -38,6 +38,16 @@ commands = find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}' +[testenv:py39] +skipdist = False +basepython = python3.9 +install_command = pip install \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/victoria/upper-constraints.txt} \ + {opts} {packages} +commands = + find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete + stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}' + [testenv:pep8] basepython = python3 deps = {[testenv]deps}