From 3477dfad00ed4e93fe2c0ea2680c63a704ea618a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 18 May 2020 08:26:31 -0500 Subject: [PATCH] Drop support for python2 python2 is EOL. OpenStack and Zuul both are python3 only. Drop the Python-2 CentOS 7 build host testing, including the tripleo centos-7 train job. Drop the old openstack-python-jobs template and move to specific version templates for what we support. Drop upper-constraints from the py35 environment, as master of requirements is now using python 3.6-only libraries. Drop the Xenial tests for similar reasons (rather than making some sort of forced install); we are keeping Python 3.5 support just for Zuul compatability at this point so a tox run is enough. Depends-On: https://review.opendev.org/729787 Depends-On: https://review.opendev.org/729508 Change-Id: I6d90754cb4b7217b10ae777d414c03466b751761 --- .zuul.d/jobs.yaml | 77 +++----------------------------------------- .zuul.d/project.yaml | 22 +++---------- setup.cfg | 8 ++--- tox.ini | 10 ++++-- 4 files changed, 20 insertions(+), 97 deletions(-) diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index e29d42bd0..fc074f18b 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -7,8 +7,7 @@ timeout: 5400 required-projects: - openstack/diskimage-builder - - name: openstack/requirements - override-checkout: stable/train + - openstack/requirements irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -24,8 +23,10 @@ - apt-sources/test-sources - centos-minimal/7-build-succeeds - centos-minimal/8-build-succeeds + - fedora/build-succeeds - ubuntu-minimal/xenial-build-succeeds - ubuntu-minimal/bionic-build-succeeds + - ubuntu-minimal/focal-build-succeeds - job: name: dib-functests-image @@ -40,6 +41,7 @@ dib_functests: - centos7/build-succeeds - centos/8-build-succeeds + - fedora/build-succeeds - opensuse/build-succeeds - opensuse/opensuse15-build-succeeds - ubuntu/xenial-build-succeeds @@ -90,11 +92,6 @@ Run the default tests on a Bionic build host with Python 3 parent: dib-functests-default nodeset: ubuntu-bionic - vars: - # These can only build on bionic - dib_functests_extra: - - fedora-minimal/build-succeeds - - ubuntu-minimal/focal-build-succeeds - job: name: dib-functests-bionic-python3-image @@ -102,9 +99,6 @@ The image tests on a Bionic build host with Python 3 parent: dib-functests-image nodeset: ubuntu-bionic - vars: - dib_functests_extra: - - fedora/build-succeeds voting: false - job: @@ -123,69 +117,6 @@ nodeset: ubuntu-bionic voting: false -# Xenial / Python3 tests -- job: - name: dib-functests-xenial-python3 - description: | - Run the default tests on a Xenial build host with Python 3 - parent: dib-functests-default - nodeset: ubuntu-xenial - -- job: - name: dib-functests-xenial-python3-image - description: | - The image tests on a Xenial build host with Python 3 - parent: dib-functests-image - nodeset: ubuntu-xenial - -- job: - name: dib-functests-xenial-python3-extras - description: | - The extras tests on a Xenial build host with Python 3 - parent: dib-functests-extras - nodeset: ubuntu-xenial - vars: - # opensuse-minimal can only build on xenial ATM, as other - # platforms don't have zypper - dib_functests_extra: - - opensuse-minimal/opensuse15-build-succeeds - -- job: - name: dib-functests-xenial-python3-containers - description: | - The containers tests on a Xenial build host with Python 3 - parent: dib-functests-containers - nodeset: ubuntu-xenial - voting: false - -# Centos 7 / Python2 tests -- job: - name: dib-functests-centos7-python2 - description: | - Run the default tests on a Centos 7 build host with Python 2 - parent: dib-functests-default - nodeset: centos-7 - vars: - dib_python: python2 - -- job: - name: dib-functests-centos7-python2-image - description: | - The image tests on a Centos 7 build host with Python 2 - parent: dib-functests-image - nodeset: centos-7 - vars: - dib_python: python2 - -- job: - name: dib-functests-centos7-python2-extras - description: | - The extras tests on a Centos 7 build host with Python 2 - parent: dib-functests-extras - nodeset: centos-7 - vars: - dib_python: python2 - # ARM64 tests - job: name: dib-functests-arm64-bionic diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 9285ceab2..f2740068b 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -3,12 +3,13 @@ - openstack-cover-jobs - check-requirements - openstack-lower-constraints-jobs - - openstack-python-jobs-no-constraints - - openstack-python35-jobs - release-notes-jobs # NOTE(ianw): 2020-05-29 jobs are unstable; see # https://bugs.launchpad.net/tripleo/+bug/1879766 - # - tripleo-buildimage-jobs + - tripleo-buildimage-jobs-centos-8 + - openstack-python35-jobs + - openstack-python36-jobs + - openstack-python38-jobs check: jobs: - openstack-tox-pylint @@ -26,24 +27,11 @@ voting: false - dib-nodepool-functional-openstack-opensuse-tumbleweed-src: voting: false - - dib-functests-centos7-python2 - - dib-functests-centos7-python2-image - - dib-functests-centos7-python2-extras - - dib-functests-xenial-python3 - - dib-functests-xenial-python3-image - - dib-functests-xenial-python3-extras - - dib-functests-xenial-python3-containers - dib-functests-bionic-python3 - dib-functests-bionic-python3-image - dib-functests-bionic-python3-extras - dib-functests-bionic-python3-containers - ironic-python-agent-check-image-dib-centos8 - # IPA jobs that build an image without further validations. - # NOTE(dtantsur): this can be removed when DIB drops CentOS 7 - # compatibility, but is useful for now since CentOS 7 is used in - # ironic Train CI. - - ironic-python-agent-check-image-dib-centos7: - voting: false # IPA jobs that build AND validate an image via deployment (two ways). - ipa-tempest-wholedisk-bios-ipmi-direct-dib-src: voting: false @@ -63,8 +51,6 @@ - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-nodepool-functional-openstack-ubuntu-focal-src - - dib-functests-xenial-python3 - - dib-functests-centos7-python2 - dib-functests-bionic-python3 - ironic-python-agent-check-image-dib-centos8 experimental: diff --git a/setup.cfg b/setup.cfg index a9f11edf7..52c35b39b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,9 +11,12 @@ classifier = Development Status :: 5 - Production/Stable License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 Environment :: Console +python-requires = >=3.5 [build_sphinx] all_files = 1 @@ -43,9 +46,6 @@ scripts = data_files = share/diskimage-builder/scripts = scripts/* -[wheel] -universal = 1 - [entry_points] console_scripts = element-info = diskimage_builder.element_dependencies:main diff --git a/tox.ini b/tox.ini index 88c836488..984a064fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,pylint,py37,py36,py35,py27 +envlist = pep8,pylint,py35,py36,py37,py38 minversion = 2.0 skipsdist = True @@ -7,7 +7,7 @@ skipsdist = True usedevelop = True install_command = pip install {opts} {packages} deps= - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands= @@ -68,3 +68,9 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt + +# Run without upper-constraints on python3.5, as since Victoria that +# now is python3.6 only +[testenv:py35] +basepython = python3.5 +deps = {[testenv:lower-constraints]deps}