diff --git a/.zuul.yaml b/.zuul.yaml index 2a7ce6250..40960e9a8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,6 @@ - check-requirements - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs - openstack-python37-jobs - publish-openstack-docs-pti @@ -13,17 +12,17 @@ - vitrage-dsvm-api-py27 - vitrage-dsvm-datasources-py27 - vitrage-dsvm-mock-py27 - - vitrage-dsvm-api-py35 - - vitrage-dsvm-datasources-py35 - - vitrage-dsvm-mock-py35 + - vitrage-dsvm-api-py3 + - vitrage-dsvm-datasources-py3 + - vitrage-dsvm-mock-py3 - grenade-vitrage gate: queue: vitrage jobs: - vitrage-dsvm-api-py27 - vitrage-dsvm-datasources-py27 - - vitrage-dsvm-api-py35 - - vitrage-dsvm-datasources-py35 + - vitrage-dsvm-api-py3 + - vitrage-dsvm-datasources-py3 - grenade-vitrage - job: @@ -45,10 +44,10 @@ - ^releasenotes/.*$ - job: - name: vitrage-dsvm-api-py35 + name: vitrage-dsvm-api-py3 parent: legacy-dsvm-base - run: playbooks/legacy/vitrage-dsvm-api-py35/run.yaml - post-run: playbooks/legacy/vitrage-dsvm-api-py35/post.yaml + run: playbooks/legacy/vitrage-dsvm-api-py3/run.yaml + post-run: playbooks/legacy/vitrage-dsvm-api-py3/post.yaml timeout: 7800 required-projects: - openstack-infra/devstack-gate @@ -81,10 +80,10 @@ - ^releasenotes/.*$ - job: - name: vitrage-dsvm-datasources-py35 + name: vitrage-dsvm-datasources-py3 parent: legacy-dsvm-base - run: playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml - post-run: playbooks/legacy/vitrage-dsvm-datasources-py35/post.yaml + run: playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml + post-run: playbooks/legacy/vitrage-dsvm-datasources-py3/post.yaml timeout: 7800 required-projects: - openstack-infra/devstack-gate @@ -116,11 +115,11 @@ - ^releasenotes/.*$ - job: - name: vitrage-dsvm-mock-py35 + name: vitrage-dsvm-mock-py3 parent: legacy-dsvm-base voting: false - run: playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml - post-run: playbooks/legacy/vitrage-dsvm-mock-py35/post.yaml + run: playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml + post-run: playbooks/legacy/vitrage-dsvm-mock-py3/post.yaml timeout: 7800 required-projects: - openstack-infra/devstack-gate diff --git a/playbooks/legacy/vitrage-dsvm-api-py35/post.yaml b/playbooks/legacy/vitrage-dsvm-api-py3/post.yaml similarity index 100% rename from playbooks/legacy/vitrage-dsvm-api-py35/post.yaml rename to playbooks/legacy/vitrage-dsvm-api-py3/post.yaml diff --git a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py3/run.yaml similarity index 95% rename from playbooks/legacy/vitrage-dsvm-api-py35/run.yaml rename to playbooks/legacy/vitrage-dsvm-api-py3/run.yaml index 753fbfce5..9ede804a6 100644 --- a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-api-py3/run.yaml @@ -1,5 +1,5 @@ - hosts: all - name: Autoconverted job legacy-vitrage-dsvm-api-py35 from old job gate-vitrage-dsvm-api-py35-ubuntu-xenial-nv + name: Autoconverted job legacy-vitrage-dsvm-api-py3 from old job gate-vitrage-dsvm-api-py35-ubuntu-xenial-nv tasks: - name: Ensure legacy workspace directory diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py35/post.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py3/post.yaml similarity index 100% rename from playbooks/legacy/vitrage-dsvm-datasources-py35/post.yaml rename to playbooks/legacy/vitrage-dsvm-datasources-py3/post.yaml diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml similarity index 94% rename from playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml rename to playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml index 43330469f..25c131a8c 100644 --- a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml @@ -1,5 +1,5 @@ - hosts: all - name: Autoconverted job legacy-vitrage-dsvm-datasources-py35 from old job gate-vitrage-dsvm-datasources-py35-ubuntu-xenial-nv + name: Autoconverted job legacy-vitrage-dsvm-datasources-py3 from old job gate-vitrage-dsvm-datasources-py35-ubuntu-xenial-nv tasks: - name: Ensure legacy workspace directory diff --git a/playbooks/legacy/vitrage-dsvm-mock-py35/post.yaml b/playbooks/legacy/vitrage-dsvm-mock-py3/post.yaml similarity index 100% rename from playbooks/legacy/vitrage-dsvm-mock-py35/post.yaml rename to playbooks/legacy/vitrage-dsvm-mock-py3/post.yaml diff --git a/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml similarity index 94% rename from playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml rename to playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml index f31d4bf9f..01a8b5d1a 100644 --- a/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml @@ -1,5 +1,5 @@ - hosts: all - name: Autoconverted job legacy-vitrage-dsvm-mock-py35 from old job gate-vitrage-dsvm-mock-py35-ubuntu-xenial-nv + name: Autoconverted job legacy-vitrage-dsvm-mock-py3 from old job gate-vitrage-dsvm-mock-py35-ubuntu-xenial-nv tasks: - name: Ensure legacy workspace directory diff --git a/setup.cfg b/setup.cfg index 3eb29fd96..49d883fe1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,7 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 Topic :: System :: Monitoring [global] diff --git a/tox.ini b/tox.ini index 6a1f31198..26953c685 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.3.1 -envlist = py36,py35,py27,pep8 +envlist = py36,py27,pep8 skipsdist = True [testenv]