[ussuri][goal] Drop python 2.7 support and testing
OpenStack is dropping the py2.7 support in ussuri cycle. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Parent tox py36/py37 jobs to openstack-tox-py36/37 so that the correct interpreter is installed. Change-Id: I14a01f0a9989195e30c3ed0dadec35490f41bd48
This commit is contained in:
Andreas Jaeger
parent
842c7404b2
commit
ba27954b06
140
.zuul.yaml
140
.zuul.yaml
|
|
@ -1,146 +1,144 @@
|
|||
- project:
|
||||
templates:
|
||||
- check-requirements
|
||||
- lib-forward-testing
|
||||
- lib-forward-testing-python3
|
||||
- openstack-cover-jobs
|
||||
- openstack-python-jobs
|
||||
- openstack-python3-train-jobs
|
||||
- periodic-stable-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- release-notes-jobs-python3
|
||||
check:
|
||||
jobs:
|
||||
- tooz-tox-py27-etcd
|
||||
- tooz-tox-py37-etcd
|
||||
- tooz-tox-py36-etcd
|
||||
- tooz-tox-py27-etcd3
|
||||
- tooz-tox-py37-etcd3
|
||||
- tooz-tox-py36-etcd3
|
||||
- tooz-tox-py27-etcd3gw
|
||||
- tooz-tox-py37-etcd3gw
|
||||
- tooz-tox-py36-etcd3gw
|
||||
- tooz-tox-py27-zookeeper
|
||||
- tooz-tox-py37-zookeeper
|
||||
- tooz-tox-py36-zookeeper
|
||||
- tooz-tox-py27-redis
|
||||
- tooz-tox-py37-redis
|
||||
- tooz-tox-py36-redis
|
||||
- tooz-tox-py27-sentinel
|
||||
- tooz-tox-py37-sentinel
|
||||
- tooz-tox-py36-sentinel
|
||||
- tooz-tox-py27-memcached
|
||||
- tooz-tox-py37-memcached
|
||||
- tooz-tox-py36-memcached
|
||||
- tooz-tox-py27-postgresql
|
||||
- tooz-tox-py37-postgresql
|
||||
- tooz-tox-py36-postgresql
|
||||
- tooz-tox-py27-mysql
|
||||
- tooz-tox-py37-mysql
|
||||
- tooz-tox-py36-mysql
|
||||
- tooz-tox-py27-consul
|
||||
- tooz-tox-py37-consul
|
||||
- tooz-tox-py36-consul
|
||||
gate:
|
||||
jobs:
|
||||
- tooz-tox-py27-etcd
|
||||
- tooz-tox-py37-etcd
|
||||
- tooz-tox-py36-etcd
|
||||
- tooz-tox-py27-etcd3
|
||||
- tooz-tox-py37-etcd3
|
||||
- tooz-tox-py36-etcd3
|
||||
- tooz-tox-py27-etcd3gw
|
||||
- tooz-tox-py37-etcd3gw
|
||||
- tooz-tox-py36-etcd3gw
|
||||
- tooz-tox-py27-zookeeper
|
||||
- tooz-tox-py37-zookeeper
|
||||
- tooz-tox-py36-zookeeper
|
||||
- tooz-tox-py27-redis
|
||||
- tooz-tox-py37-redis
|
||||
- tooz-tox-py36-redis
|
||||
- tooz-tox-py27-sentinel
|
||||
- tooz-tox-py37-sentinel
|
||||
- tooz-tox-py36-sentinel
|
||||
- tooz-tox-py27-memcached
|
||||
- tooz-tox-py37-memcached
|
||||
- tooz-tox-py36-memcached
|
||||
- tooz-tox-py27-postgresql
|
||||
- tooz-tox-py37-postgresql
|
||||
- tooz-tox-py36-postgresql
|
||||
- tooz-tox-py27-mysql
|
||||
- tooz-tox-py37-mysql
|
||||
- tooz-tox-py36-mysql
|
||||
- tooz-tox-py27-consul
|
||||
- tooz-tox-py37-consul
|
||||
- tooz-tox-py36-consul
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-consul
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-consul
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-consul`` environment.
|
||||
Run tests using ``py37-consul`` environment.
|
||||
vars:
|
||||
tox_envlist: mysql-python
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-etcd
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-etcd
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-etcd`` environment.
|
||||
Run tests using ``py37-etcd`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-etcd
|
||||
tox_envlist: py37-etcd
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-etcd3
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-etcd3
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-etcd3`` environment.
|
||||
Run tests using ``py37-etcd3`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-etcd3
|
||||
tox_envlist: py37-etcd3
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-etcd3gw
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-etcd3gw
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-etcd3gw`` environment.
|
||||
Run tests using ``py37-etcd3gw`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-etcd3gw
|
||||
tox_envlist: py37-etcd3gw
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-memcached
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-memcached
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-memcached`` environment.
|
||||
Run tests using ``py37-memcached`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-memcached
|
||||
tox_envlist: py37-memcached
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-mysql
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-mysql
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-mysql`` environment.
|
||||
Run tests using ``py37-mysql`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-mysql
|
||||
tox_envlist: py37-mysql
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-postgresql
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-postgresql
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-postgresql`` environment.
|
||||
Run tests using ``py37-postgresql`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-postgresql
|
||||
tox_envlist: py37-postgresql
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-redis
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-redis
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-redis`` environment.
|
||||
Run tests using ``py37-redis`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-redis
|
||||
tox_envlist: py37-redis
|
||||
pre-run:
|
||||
- playbooks/stop-redis.yaml
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-sentinel
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-sentinel
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-sentinel`` environment.
|
||||
Run tests using ``py37-sentinel`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-sentinel
|
||||
tox_envlist: py37-sentinel
|
||||
pre-run:
|
||||
- playbooks/stop-redis.yaml
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py27-zookeeper
|
||||
parent: openstack-tox
|
||||
name: tooz-tox-py37-zookeeper
|
||||
parent: openstack-tox-py37
|
||||
description: |
|
||||
Run tests using ``py27-zookeeper`` environment.
|
||||
Run tests using ``py37-zookeeper`` environment.
|
||||
vars:
|
||||
tox_envlist: py27-zookeeper
|
||||
tox_envlist: py37-zookeeper
|
||||
|
||||
- job:
|
||||
name: tooz-tox-py36-consul
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-consul`` environment.
|
||||
vars:
|
||||
|
|
@ -148,7 +146,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-etcd
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-etcd`` environment.
|
||||
vars:
|
||||
|
|
@ -156,7 +154,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-etcd3
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-etcd3`` environment.
|
||||
vars:
|
||||
|
|
@ -164,7 +162,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-etcd3gw
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-etcd3gw`` environment.
|
||||
vars:
|
||||
|
|
@ -172,7 +170,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-memcached
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-memcached`` environment.
|
||||
vars:
|
||||
|
|
@ -180,7 +178,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-mysql
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-mysql`` environment.
|
||||
vars:
|
||||
|
|
@ -188,7 +186,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-postgresql
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-postgresql`` environment.
|
||||
vars:
|
||||
|
|
@ -196,7 +194,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-redis
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-redis`` environment.
|
||||
vars:
|
||||
|
|
@ -206,7 +204,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-sentinel
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-sentinel`` environment.
|
||||
vars:
|
||||
|
|
@ -216,7 +214,7 @@
|
|||
|
||||
- job:
|
||||
name: tooz-tox-py36-zookeeper
|
||||
parent: openstack-tox
|
||||
parent: openstack-tox-py36
|
||||
description: |
|
||||
Run tests using ``py36-zookeeper`` environment.
|
||||
vars:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0;python_version>='3.4' # BSD
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0 # BSD
|
||||
openstackdocstheme>=1.11.0 # Apache-2.0
|
||||
reno>=1.8.0 # Apache-2.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Python 2.7 support has been dropped. The minimum version of Python now
|
||||
supported by tooz is Python 3.6.
|
||||
|
|
@ -4,12 +4,10 @@
|
|||
pbr>=1.6 # Apache-2.0
|
||||
stevedore>=1.16.0 # Apache-2.0
|
||||
six>=1.9.0 # MIT
|
||||
enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
|
||||
voluptuous>=0.8.9 # BSD License
|
||||
msgpack>=0.4.0 # Apache-2.0
|
||||
fasteners>=0.7 # Apache-2.0
|
||||
tenacity>=3.2.1 # Apache-2.0
|
||||
futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
|
||||
futurist>=1.2.0 # Apache-2.0
|
||||
oslo.utils>=3.15.0 # Apache-2.0
|
||||
oslo.serialization>=1.10.0 # Apache-2.0
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ summary = Coordination library for distributed systems.
|
|||
description-file = README.rst
|
||||
license = Apache-2
|
||||
home-page = https://docs.openstack.org/tooz/latest/
|
||||
python-requires = >=3.6
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Developers
|
||||
|
|
@ -13,11 +14,11 @@ classifier =
|
|||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3 :: Only
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
Topic :: System :: Distributed Computing
|
||||
|
||||
[files]
|
||||
|
|
@ -64,5 +65,3 @@ memcached =
|
|||
pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License
|
||||
ipc =
|
||||
sysv-ipc>=0.6.8 # BSD License
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
|
|
|||
14
tox.ini
14
tox.ini
|
|
@ -1,8 +1,10 @@
|
|||
[tox]
|
||||
minversion = 3.1.0
|
||||
envlist = py27,py37,py{27,36}-{zookeeper,redis,sentinel,memcached,postgresql,mysql,consul,etcd,etcd3,etcd3gw},pep8
|
||||
envlist = py37,py{36,37}-{zookeeper,redis,sentinel,memcached,postgresql,mysql,consul,etcd,etcd3,etcd3gw},pep8
|
||||
ignore_basepython_conflict = True
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
# We need to install a bit more than just `test-requirements' because those drivers have
|
||||
# custom tests that we always run
|
||||
deps = .[zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw]
|
||||
|
|
@ -36,17 +38,12 @@ commands =
|
|||
{toxinidir}/run-tests.sh stestr run "{posargs}"
|
||||
{toxinidir}/run-examples.sh
|
||||
|
||||
[testenv:py27]
|
||||
basepython = python2.7
|
||||
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
# This target is used by the gate go run Sphinx to build the doc
|
||||
deps = {[testenv:docs]deps}
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
basepython = python3
|
||||
deps = {[testenv]deps}
|
||||
setenv = {[testenv]setenv}
|
||||
PYTHON=coverage run --source tooz --parallel-mode
|
||||
|
|
@ -58,13 +55,11 @@ commands =
|
|||
coverage xml -o cover/coverage.xml
|
||||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = hacking<0.13,>=0.12
|
||||
deps = hacking<2.1,>=2.0
|
||||
doc8
|
||||
commands =
|
||||
flake8
|
||||
|
|
@ -75,6 +70,5 @@ exclude=.venv,.git,.tox,dist,*egg,*.egg-info,build,examples,doc
|
|||
show-source = True
|
||||
|
||||
[testenv:releasenotes]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||
|
|
|
|||
Loading…
Reference in New Issue