[ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

murano-agent is ready with python 3 and ok to drop the
python 2.7 support.

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

Depends-On: https://review.opendev.org/#/c/693631/
Change-Id: I343c7e7bde76f086e00756be63de48204dcdb0a9
This commit is contained in:
Ghanshyam Mann 2019-11-16 00:17:30 +00:00 committed by zhurong
parent 755aaa02a1
commit 2b2cc45bce
7 changed files with 11 additions and 17 deletions

View File

@ -2,6 +2,5 @@
templates:
- check-requirements
- openstack-lower-constraints-jobs
- openstack-python-jobs
- openstack-python3-train-jobs
- openstack-python3-ussuri-jobs
- release-notes-jobs-python3

View File

@ -1,4 +1,3 @@
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;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0

View File

@ -19,7 +19,7 @@ fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
gitdb2==2.0.3
GitPython==2.1.8
GitPython==3.0.5
greenlet==0.4.13
hacking==0.12.0
idna==2.6

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Python 2.7 support has been dropped. Last release of murano-agent
to support python 2.7 is OpenStack Train. The minimum version of Python now
supported by murano-agent is Python 3.6.

View File

@ -4,7 +4,7 @@
pbr>=3.1.1 # Apache-2.0
anyjson>=0.3.3 # BSD
eventlet>=0.20.0,!=0.20.1,!=0.21.0 # MIT
GitPython>=2.1.8 # BSD License (3 clause)
GitPython>=3.0.5;python_version>='3.0' # BSD License (3 clause)
kombu>=4.1.0 # BSD
oslo.config>=5.2.0 # Apache-2.0
oslo.log>=3.37.0 # Apache-2.0

View File

@ -15,8 +15,6 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
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

12
tox.ini
View File

@ -1,9 +1,10 @@
[tox]
envlist = py37,py27,pep8
envlist = py37,pep8
minversion = 2.0
skipsdist = True
[testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
usedevelop = True
@ -18,28 +19,23 @@ whitelist_externals = bash
find
[testenv:pep8]
basepython = python3
commands =
flake8 {posargs}
[testenv:venv]
basepython = python3
commands = {posargs}
[testenv:cover]
basepython = python3
commands = python setup.py test --coverage \
--coverage-package-name=muranoagent --testr-args='{posargs}'
coverage report --omit '*/tests/*'
[testenv:debug]
basepython = python3
commands =
find . -type f -name "*.pyc" -delete
oslo_debug_helper -t muranoagent/tests {posargs}
[testenv:docs]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
@ -47,16 +43,13 @@ deps =
commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
[testenv:pyflakes]
basepython = python3
deps = flake8
commands = flake8
[testenv:genconfig]
basepython = python3
commands = oslo-config-generator --config-file etc/oslo-config-generator/muranoagent.conf
[testenv:releasenotes]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
@ -69,7 +62,6 @@ show-source = true
exclude=.git,.tox,dist,doc,*lib/python*,*egg
[testenv:lower-constraints]
basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt