[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

Change-Id: I15cc79159b603e232e442e202c78d6c56dc73252
This commit is contained in:
Hervé Beraud 2020-02-03 17:47:44 +01:00
parent 3ad0a72cdd
commit 32a1b6e948
7 changed files with 12 additions and 67 deletions

View File

@ -1,23 +1,3 @@
- job:
name: oslo.messaging-tox-py27-func-amqp1
parent: openstack-tox-py27
vars:
tox_envlist: py27-func-amqp1
- job:
name: oslo.messaging-tox-py27-func-kafka
parent: openstack-tox-py27
vars:
tox_envlist: py27-func-kafka
bindep_profile: kafka
- job:
name: oslo.messaging-tox-py27-func-rabbit
parent: openstack-tox-py27
vars:
tox_envlist: py27-func-rabbit
bindep_profile: rabbit
- job: - job:
name: oslo.messaging-tox-py36-func-amqp1 name: oslo.messaging-tox-py36-func-amqp1
parent: openstack-tox-py36 parent: openstack-tox-py36
@ -150,22 +130,15 @@
- project: - project:
templates: templates:
- check-requirements - check-requirements
- lib-forward-testing
- lib-forward-testing-python3 - lib-forward-testing-python3
- openstack-cover-jobs - openstack-cover-jobs
- openstack-lower-constraints-jobs - openstack-lower-constraints-jobs
- openstack-python-jobs
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
- periodic-stable-jobs - periodic-stable-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:
- oslo.messaging-tox-py27-func-rabbit
- oslo.messaging-tox-py27-func-amqp1:
voting: false
- oslo.messaging-tox-py27-func-kafka:
voting: false
- oslo.messaging-tox-py36-func-rabbit: - oslo.messaging-tox-py36-func-rabbit:
voting: false voting: false
- oslo.messaging-tox-py36-func-amqp1: - oslo.messaging-tox-py36-func-amqp1:
@ -190,5 +163,5 @@
gate: gate:
jobs: jobs:
- oslo.messaging-tox-py27-func-rabbit - oslo.messaging-tox-py36-func-rabbit
- oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-rabbit

View File

@ -3,8 +3,7 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD sphinx>=1.8.0,!=2.1.0 # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0
# imported when the source code is parsed for generating documentation: # imported when the source code is parsed for generating documentation:

View File

@ -18,7 +18,6 @@ extras==1.0.0
fasteners==0.7.0 fasteners==0.7.0
fixtures==3.0.0 fixtures==3.0.0
flake8==2.5.5 flake8==2.5.5
futures==3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
futurist==1.2.0 futurist==1.2.0
gitdb==0.6.4 gitdb==0.6.4
GitPython==1.0.1 GitPython==1.0.1

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Support for Python 2.7 has been dropped. The latest version of Python now
supported is Python 3.6.

View File

@ -6,6 +6,7 @@ summary = Oslo Messaging API
description-file = description-file =
README.rst README.rst
home-page = https://docs.openstack.org/oslo.messaging/latest/ home-page = https://docs.openstack.org/oslo.messaging/latest/
python-requires = >=3.6
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Developers Intended Audience :: Developers
@ -13,11 +14,11 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: OS Independent Operating System :: OS Independent
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
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
[extras] [extras]
# package dependencies for optional (non-rabbitmq) messaging drivers. # package dependencies for optional (non-rabbitmq) messaging drivers.
@ -65,9 +66,6 @@ oslo.messaging.notify.drivers =
oslo.config.opts = oslo.config.opts =
oslo.messaging = oslo_messaging.opts:list_opts oslo.messaging = oslo_messaging.opts:list_opts
[bdist_wheel]
universal = 1
[compile_catalog] [compile_catalog]
directory = oslo_messaging/locale directory = oslo_messaging/locale
domain = oslo_messaging domain = oslo_messaging

View File

@ -16,14 +16,6 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

25
tox.ini
View File

@ -1,7 +1,7 @@
[tox] [tox]
minversion = 3.1 minversion = 3.1
envlist = py27,py37,pep8 envlist = py37,pep8
ignore_basepython_conflict = True ignore_basepython_conflict = true
[testenv] [testenv]
basepython = python3 basepython = python3
@ -42,33 +42,12 @@ commands =
rm -fr doc/build rm -fr doc/build
sphinx-build -W --keep-going -b html doc/source doc/build/html sphinx-build -W --keep-going -b html doc/source doc/build/html
[testenv:py27-func-rabbit]
setenv =
{[testenv]setenv}
TRANSPORT_DRIVER=rabbit
commands = pifpaf run rabbitmq -- stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py36-func-rabbit] [testenv:py36-func-rabbit]
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
TRANSPORT_DRIVER=rabbit TRANSPORT_DRIVER=rabbit
commands = pifpaf run rabbitmq -- stestr run --slowest {posargs:oslo_messaging.tests.functional} commands = pifpaf run rabbitmq -- stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py27-func-kafka]
setenv =
{[testenv]setenv}
TRANSPORT_URL=kafka://127.0.0.1:9092/
OS_GROUP_REGEX=oslo_messaging.tests.functional
commands = {toxinidir}/setup-test-env-kafka.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py27-func-amqp1]
setenv =
{[testenv]setenv}
TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:5672//
ENVNAME={envname}
WORKDIR={toxworkdir}
commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py36-func-amqp1] [testenv:py36-func-amqp1]
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}