Merge "Drop python 2.7 support and testing"
This commit is contained in:
commit
129bfc837f
44
.zuul.yaml
44
.zuul.yaml
|
@ -12,6 +12,7 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
LIBS_FROM_GIT: glance_store
|
LIBS_FROM_GIT: glance_store
|
||||||
|
USE_PYTHON3: True
|
||||||
devstack_services:
|
devstack_services:
|
||||||
# turn off ceilometer
|
# turn off ceilometer
|
||||||
ceilometer-acentral: false
|
ceilometer-acentral: false
|
||||||
|
@ -54,14 +55,6 @@
|
||||||
- name: openstack/os-brick
|
- name: openstack/os-brick
|
||||||
- name: openstack/python-cinderclient
|
- name: openstack/python-cinderclient
|
||||||
|
|
||||||
- job:
|
|
||||||
name: glance_store-tox-py27-cinder-tips
|
|
||||||
parent: glance_store-tox-cinder-tips-base
|
|
||||||
description: |
|
|
||||||
glance_store py27 unit tests vs. cinder masters
|
|
||||||
vars:
|
|
||||||
tox_envlist: py27
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: glance_store-tox-py36-cinder-tips
|
name: glance_store-tox-py36-cinder-tips
|
||||||
parent: glance_store-tox-cinder-tips-base
|
parent: glance_store-tox-cinder-tips-base
|
||||||
|
@ -79,14 +72,6 @@
|
||||||
- name: openstack/keystoneauth
|
- name: openstack/keystoneauth
|
||||||
- name: openstack/python-keystoneclient
|
- name: openstack/python-keystoneclient
|
||||||
|
|
||||||
- job:
|
|
||||||
name: glance_store-tox-py27-keystone-tips
|
|
||||||
parent: glance_store-tox-keystone-tips-base
|
|
||||||
description: |
|
|
||||||
glance_store py27 unit tests vs. keystone masters
|
|
||||||
vars:
|
|
||||||
tox_envlist: py27
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: glance_store-tox-py36-keystone-tips
|
name: glance_store-tox-py36-keystone-tips
|
||||||
parent: glance_store-tox-keystone-tips-base
|
parent: glance_store-tox-keystone-tips-base
|
||||||
|
@ -111,14 +96,6 @@
|
||||||
- name: openstack/oslo.vmware
|
- name: openstack/oslo.vmware
|
||||||
- name: openstack/stevedore
|
- name: openstack/stevedore
|
||||||
|
|
||||||
- job:
|
|
||||||
name: glance_store-tox-py27-oslo-tips
|
|
||||||
parent: glance_store-tox-oslo-tips-base
|
|
||||||
description: |
|
|
||||||
glance_store py27 unit tests vs. oslo masters
|
|
||||||
vars:
|
|
||||||
tox_envlist: py27
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: glance_store-tox-py36-oslo-tips
|
name: glance_store-tox-py36-oslo-tips
|
||||||
parent: glance_store-tox-oslo-tips-base
|
parent: glance_store-tox-oslo-tips-base
|
||||||
|
@ -135,14 +112,6 @@
|
||||||
required-projects:
|
required-projects:
|
||||||
- name: openstack/python-swiftclient
|
- name: openstack/python-swiftclient
|
||||||
|
|
||||||
- job:
|
|
||||||
name: glance_store-tox-py27-swift-tips
|
|
||||||
parent: glance_store-tox-swift-tips-base
|
|
||||||
description: |
|
|
||||||
glance_store py27 unit tests vs. swift masters
|
|
||||||
vars:
|
|
||||||
tox_envlist: py27
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: glance_store-tox-py36-swift-tips
|
name: glance_store-tox-py36-swift-tips
|
||||||
parent: glance_store-tox-swift-tips-base
|
parent: glance_store-tox-swift-tips-base
|
||||||
|
@ -157,8 +126,7 @@
|
||||||
- lib-forward-testing
|
- lib-forward-testing
|
||||||
- lib-forward-testing-python3
|
- lib-forward-testing-python3
|
||||||
- openstack-lower-constraints-jobs
|
- openstack-lower-constraints-jobs
|
||||||
- openstack-python-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-python3-train-jobs
|
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
|
@ -192,19 +160,11 @@
|
||||||
# to define these jobs in the openstack/project-config repo.
|
# to define these jobs in the openstack/project-config repo.
|
||||||
# That would make us less agile in adjusting these tests, so we
|
# That would make us less agile in adjusting these tests, so we
|
||||||
# aren't doing that either.
|
# aren't doing that either.
|
||||||
- glance_store-tox-py27-cinder-tips:
|
|
||||||
branches: master
|
|
||||||
- glance_store-tox-py36-cinder-tips:
|
- glance_store-tox-py36-cinder-tips:
|
||||||
branches: master
|
branches: master
|
||||||
- glance_store-tox-py27-keystone-tips:
|
|
||||||
branches: master
|
|
||||||
- glance_store-tox-py36-keystone-tips:
|
- glance_store-tox-py36-keystone-tips:
|
||||||
branches: master
|
branches: master
|
||||||
- glance_store-tox-py27-oslo-tips:
|
|
||||||
branches: master
|
|
||||||
- glance_store-tox-py36-oslo-tips:
|
- glance_store-tox-py36-oslo-tips:
|
||||||
branches: master
|
branches: master
|
||||||
- glance_store-tox-py27-swift-tips:
|
|
||||||
branches: master
|
|
||||||
- glance_store-tox-py36-swift-tips:
|
- glance_store-tox-py36-swift-tips:
|
||||||
branches: master
|
branches: master
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Python 2.7 support has been dropped. Last release of glance_store
|
||||||
|
to support py2.7 is OpenStack Train. The minimum version of Python now
|
||||||
|
supported by glance_store is Python 3.6.
|
|
@ -14,8 +14,6 @@ classifier =
|
||||||
License :: OSI Approved :: Apache Software License
|
License :: OSI Approved :: Apache Software License
|
||||||
Operating System :: POSIX :: Linux
|
Operating System :: POSIX :: Linux
|
||||||
Programming Language :: Python
|
Programming Language :: Python
|
||||||
Programming Language :: Python :: 2
|
|
||||||
Programming Language :: Python :: 2.7
|
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
|
|
12
tox.ini
12
tox.ini
|
@ -1,9 +1,11 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 3.1.1
|
||||||
envlist = py27,py37,pep8
|
envlist = py37,py36,pep8
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
deps =
|
deps =
|
||||||
|
@ -14,23 +16,19 @@ passenv = OS_TEST_*
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -a -E -W -d releasenotes/build/.doctrees -b html releasenotes/source releasenotes/build/html
|
commands = sphinx-build -a -E -W -d releasenotes/build/.doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs}
|
flake8 {posargs}
|
||||||
doc8 {posargs}
|
doc8 {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv =
|
setenv =
|
||||||
PYTHON=coverage run --source glance_store --parallel-mode
|
PYTHON=coverage run --source glance_store --parallel-mode
|
||||||
commands =
|
commands =
|
||||||
|
@ -40,7 +38,6 @@ commands =
|
||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# See glance_store/tests/functional/README.rst for information on writing or
|
# See glance_store/tests/functional/README.rst for information on writing or
|
||||||
|
@ -66,7 +63,6 @@ ignore = H301,H404,H405
|
||||||
exclude = .venv,.git,.tox,dist,doc,etc,*glance_store/locale*,*lib/python*,*egg,build
|
exclude = .venv,.git,.tox,dist,doc,etc,*glance_store/locale*,*lib/python*,*egg,build
|
||||||
|
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{toxinidir}/lower-constraints.txt
|
-c{toxinidir}/lower-constraints.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
Loading…
Reference in New Issue