[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 Remove cruft from setup.cfg. Update hacking so that it works with python3 and silence new warnings. Change-Id: Id224fc09ac36d2a84e82347530bb5e5d30665803
This commit is contained in:
Andreas Jaeger
parent
0b352712af
commit
fc401959ec
|
|
@ -1,11 +1,9 @@
|
|||
- project:
|
||||
templates:
|
||||
- check-requirements
|
||||
- lib-forward-testing
|
||||
- lib-forward-testing-python3
|
||||
- openstack-lower-constraints-jobs
|
||||
- openstack-cover-jobs
|
||||
- openstack-python-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- periodic-stable-jobs
|
||||
- publish-openstack-docs-pti
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
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
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
doc8>=0.6.0 # Apache-2.0
|
||||
|
|
|
|||
|
|
@ -10,13 +10,11 @@ contextlib2==0.4.0
|
|||
decorator==3.4.0
|
||||
doc8==0.6.0
|
||||
docutils==0.11
|
||||
enum34==1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
|
||||
eventlet==0.18.2
|
||||
extras==1.0.0
|
||||
fasteners==0.7.0
|
||||
fixtures==3.0.0
|
||||
flake8==2.2.4
|
||||
futures==3.0.0;python_version=='2.7' or python_version=='2.6'
|
||||
futurist==1.2.0
|
||||
greenlet==0.4.10
|
||||
hacking==0.10.0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Python 2.7 support has been dropped. The minimum version of Python now
|
||||
supported by taskflow is Python 3.6.
|
||||
|
|
@ -10,9 +10,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
|||
# Python 2->3 compatibility library.
|
||||
six>=1.10.0 # MIT
|
||||
|
||||
# Enum library made for <= python 3.3
|
||||
enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
|
||||
|
||||
# For async and/or periodic work
|
||||
futurist>=1.2.0 # Apache-2.0
|
||||
|
||||
|
|
@ -20,18 +17,11 @@ futurist>=1.2.0 # Apache-2.0
|
|||
fasteners>=0.7.0 # Apache-2.0
|
||||
|
||||
# Very nice graph library
|
||||
networkx>=2.1.0,<2.3;python_version<'3.0' # BSD
|
||||
networkx>=2.1.0;python_version>='3.4' # BSD
|
||||
|
||||
# For contextlib new additions/compatibility for <= python 3.3
|
||||
contextlib2>=0.4.0;python_version<'3.0' # PSF License
|
||||
networkx>=2.1.0 # BSD
|
||||
|
||||
# Used for backend storage engine loading.
|
||||
stevedore>=1.20.0 # Apache-2.0
|
||||
|
||||
# Backport for concurrent.futures which exists in 3.2+
|
||||
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
|
||||
|
||||
# Used for structured input validation
|
||||
jsonschema>=2.6.0 # MIT
|
||||
|
||||
|
|
|
|||
28
setup.cfg
28
setup.cfg
|
|
@ -7,6 +7,7 @@ author = OpenStack
|
|||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/taskflow/latest/
|
||||
keywords = reliable,tasks,execution,parallel,dataflow,workflows,distributed
|
||||
python-requires = >=3.6
|
||||
classifier =
|
||||
Development Status :: 4 - Beta
|
||||
Environment :: OpenStack
|
||||
|
|
@ -15,18 +16,14 @@ 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 :: Software Development :: Libraries
|
||||
Topic :: System :: Distributed Computing
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
|
||||
[files]
|
||||
packages =
|
||||
taskflow
|
||||
|
|
@ -82,22 +79,3 @@ test =
|
|||
testtools>=2.2.0 # MIT
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
stestr>=2.0.0 # Apache-2.0
|
||||
|
||||
[nosetests]
|
||||
cover-erase = true
|
||||
verbosity = 2
|
||||
|
||||
[pbr]
|
||||
warnerrors = True
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
build-dir = doc/build
|
||||
all_files = 1
|
||||
warning-is-error = 1
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ psycopg2>=2.7.0 # LGPL/ZPL
|
|||
|
||||
# test
|
||||
pydotplus>=2.0.2 # MIT License
|
||||
hacking<0.11,>=0.10.0
|
||||
hacking<2.1,>=2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
|
|
|
|||
18
tox.ini
18
tox.ini
|
|
@ -1,8 +1,10 @@
|
|||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = cover,docs,pep8,py27,py37,pylint,update-states
|
||||
minversion = 3.1.0
|
||||
envlist = cover,docs,pep8,py37,pylint,update-states
|
||||
ignore_basepython_conflict = True
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
setenv =
|
||||
# We need to install a bit more than just `test' because those drivers have
|
||||
# custom tests that we always run
|
||||
|
|
@ -14,7 +16,6 @@ commands =
|
|||
stestr run {posargs}
|
||||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
-r{toxinidir}/doc/requirements.txt
|
||||
|
|
@ -23,26 +24,22 @@ commands =
|
|||
doc8 doc/source
|
||||
|
||||
[testenv:update-states]
|
||||
basepython = python3
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
pydot3
|
||||
commands = {toxinidir}/tools/update_states.sh
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
commands =
|
||||
flake8 {posargs}
|
||||
|
||||
[testenv:pylint]
|
||||
basepython = python3
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
pylint==0.26.0
|
||||
commands = pylint --rcfile=pylintrc taskflow
|
||||
|
||||
[testenv:cover]
|
||||
basepython = python3
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
coverage>=3.6
|
||||
|
|
@ -56,13 +53,12 @@ commands =
|
|||
coverage xml -o cover/coverage.xml
|
||||
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
commands = {posargs}
|
||||
|
||||
[flake8]
|
||||
builtins = _
|
||||
exclude = .venv,.tox,dist,doc,*egg,.git,build,tools
|
||||
ignore = E721
|
||||
ignore = E305,E402,E721,E731,E741,W503,W504
|
||||
|
||||
[hacking]
|
||||
import_exceptions =
|
||||
|
|
@ -78,12 +74,10 @@ import_exceptions =
|
|||
ignore-path = doc/*/target,doc/*/build*
|
||||
|
||||
[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
|
||||
|
||||
[testenv:bindep]
|
||||
basepython = python3
|
||||
# Do not install any requirements. We want this to be fast and work even if
|
||||
# system dependencies are missing, since it's used to tell you what system
|
||||
# dependencies are missing! This also means that bindep must be installed
|
||||
|
|
@ -95,8 +89,6 @@ commands = bindep test
|
|||
usedevelop = False
|
||||
|
||||
[testenv:lower-constraints]
|
||||
basepython = python3
|
||||
install_command = pip install {opts} {packages}
|
||||
deps =
|
||||
-c{toxinidir}/lower-constraints.txt
|
||||
.[test,workers,zookeeper,database,redis,eventlet]
|
||||
|
|
|
|||
Loading…
Reference in New Issue