diff --git a/.zuul.yaml b/.zuul.yaml index 7a88fa3bc1..8a29bb836c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -13,22 +13,6 @@ TMPDIR: '{{ ansible_env.HOME }}/xfstmp' COLUMNS: 240 -- job: - name: swift-tox-py36 - parent: swift-tox-base - nodeset: ubuntu-bionic - description: | - Run unit-tests for swift under cPython version 3.6. - - Uses tox with the ``py36`` environment. - It sets TMPDIR to an XFS mount point created via - tools/test-setup.sh. - vars: - tox_envlist: py36 - bindep_profile: test py36 - python_version: 3.6 - post-run: tools/playbooks/common/cover-post.yaml - - job: name: swift-tox-py37 parent: swift-tox-base @@ -499,8 +483,8 @@ # This seems defensible for a l-c job nodeset: ubuntu-bionic vars: - bindep_profile: test py36 - python_version: 3.6 + bindep_profile: test py37 + python_version: 3.7 tox_environment: TMPDIR: '{{ ansible_env.HOME }}/xfstmp' @@ -637,7 +621,7 @@ irrelevant-files: *docker-irrelevant-files # Unit tests - - swift-tox-py36: + - swift-tox-py37: irrelevant-files: &unittest-irrelevant-files - ^(api-ref|doc|releasenotes)/.*$ - ^test/(cors|functional|probe|s3api)/.*$ @@ -724,7 +708,7 @@ irrelevant-files: *docker-irrelevant-files - swift-upload-image-py3: irrelevant-files: *docker-irrelevant-files - - swift-tox-py36 + - swift-tox-py37 - swift-tox-py39 - swift-tox-py312 - swift-tox-func-py312 @@ -758,7 +742,6 @@ irrelevant-files: *tempest-irrelevant-files experimental: jobs: - - swift-tox-py37 - swift-tox-py38 - swift-tox-py310 - swift-tox-py311 diff --git a/setup.cfg b/setup.cfg index 648cddb67f..830268bb3f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ long_description_content_type = text/x-rst author = OpenStack author_email = openstack-discuss@lists.openstack.org url = https://docs.openstack.org/swift/latest/ -python_requires = >=3.6 +python_requires = >=3.7 project_urls = Documentation = https://docs.openstack.org/swift/latest/ Bug Tracker = https://bugs.launchpad.net/swift @@ -22,7 +22,6 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9