Merge "[ussuri][goal] Drop python 2.7 support and testing"
This commit is contained in:
commit
248dc815d0
|
@ -1,7 +1,6 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- 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
|
||||||
|
|
|
@ -3,5 +3,4 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||||
reno>=2.5.0 # Apache-2.0
|
reno>=2.5.0 # Apache-2.0
|
||||||
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 # BSD
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
|
||||||
|
|
|
@ -31,9 +31,6 @@ repository_name = 'openstack/os-testr'
|
||||||
bug_project = 'os-testr'
|
bug_project = 'os-testr'
|
||||||
bug_tag = ''
|
bug_tag = ''
|
||||||
|
|
||||||
# Must set this variable to include year, month, day, hours, and minutes.
|
|
||||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
|
||||||
|
|
||||||
# autodoc generation is a bit aggressive and a nuisance when doing heavy
|
# autodoc generation is a bit aggressive and a nuisance when doing heavy
|
||||||
# text edit cycles.
|
# text edit cycles.
|
||||||
# execute "export SPHINX_DEBUG=1" in your terminal to disable
|
# execute "export SPHINX_DEBUG=1" in your terminal to disable
|
||||||
|
|
|
@ -279,5 +279,6 @@ def ostestr(args):
|
||||||
def main():
|
def main():
|
||||||
exit(ostestr(sys.argv[1:]))
|
exit(ostestr(sys.argv[1:]))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
|
@ -209,7 +209,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||||
$LISTOPT $IDOPTION
|
$LISTOPT $IDOPTION
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
group_regex=([^\.]+\.)+
|
group_regex=([^\\.]+\\.)+
|
||||||
"""
|
"""
|
||||||
with io.StringIO() as testrconf_data_file:
|
with io.StringIO() as testrconf_data_file:
|
||||||
testrconf_data_file.write(testrconf_data)
|
testrconf_data_file.write(testrconf_data)
|
||||||
|
@ -221,7 +221,7 @@ group_regex=([^\.]+\.)+
|
||||||
# validate the discovery of the options from the legacy
|
# validate the discovery of the options from the legacy
|
||||||
# .testr.conf
|
# .testr.conf
|
||||||
self.assertEqual(parsed_values, ('mytestdir', None,
|
self.assertEqual(parsed_values, ('mytestdir', None,
|
||||||
'([^\.]+\.)+'))
|
r'([^\.]+\.)+'))
|
||||||
|
|
||||||
def test_parse_legacy_testrconf_topdir(self):
|
def test_parse_legacy_testrconf_topdir(self):
|
||||||
'''Test parse_testrconf
|
'''Test parse_testrconf
|
||||||
|
@ -238,7 +238,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||||
$LISTOPT $IDOPTION
|
$LISTOPT $IDOPTION
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
group_regex=([^\.]+\.)+
|
group_regex=([^\\.]+\\.)+
|
||||||
"""
|
"""
|
||||||
with io.StringIO() as testrconf_data_file:
|
with io.StringIO() as testrconf_data_file:
|
||||||
testrconf_data_file.write(testrconf_data)
|
testrconf_data_file.write(testrconf_data)
|
||||||
|
@ -250,4 +250,4 @@ group_regex=([^\.]+\.)+
|
||||||
# validate the discovery of the options from the legacy
|
# validate the discovery of the options from the legacy
|
||||||
# .testr.conf
|
# .testr.conf
|
||||||
self.assertEqual(parsed_values, ('mytestdir', '..',
|
self.assertEqual(parsed_values, ('mytestdir', '..',
|
||||||
'([^\.]+\.)+'))
|
r'([^\.]+\.)+'))
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Python 2.7 support has been dropped. Last release of os-testr
|
||||||
|
to support python 2.7 is 1.1.0. The minimum version of Python now
|
||||||
|
supported by os-testr is Python 3.6.
|
13
setup.cfg
13
setup.cfg
|
@ -6,6 +6,7 @@ description-file =
|
||||||
author = OpenStack
|
author = OpenStack
|
||||||
author-email = openstack-discuss@lists.openstack.org
|
author-email = openstack-discuss@lists.openstack.org
|
||||||
home-page = https://docs.openstack.org/os-testr/latest/
|
home-page = https://docs.openstack.org/os-testr/latest/
|
||||||
|
python-requires = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
|
@ -13,11 +14,11 @@ 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
|
||||||
|
Programming Language :: Python :: 3 :: Only
|
||||||
|
Programming Language :: Python :: Implementation :: CPython
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
packages =
|
packages =
|
||||||
|
@ -30,11 +31,3 @@ console_scripts =
|
||||||
subunit2html = os_testr.subunit2html:main
|
subunit2html = os_testr.subunit2html:main
|
||||||
generate-subunit = os_testr.generate_subunit:main
|
generate-subunit = os_testr.generate_subunit:main
|
||||||
|
|
||||||
[build_sphinx]
|
|
||||||
source-dir = doc/source
|
|
||||||
build-dir = doc/build
|
|
||||||
all_files = 1
|
|
||||||
warning-is-error = 1
|
|
||||||
|
|
||||||
[upload_sphinx]
|
|
||||||
upload-dir = doc/build/html
|
|
||||||
|
|
8
setup.py
8
setup.py
|
@ -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)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
hacking>=2.0,<2.1 # Apache-2.0
|
||||||
|
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
|
|
24
tox.ini
24
tox.ini
|
@ -1,11 +1,13 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 3.1.1
|
||||||
envlist = py27,py36,py37,pypy,pep8
|
envlist = py36,py37,pypy,pep8
|
||||||
skipsdist = True
|
# Need to set to False to have CHANGES generated
|
||||||
|
skipsdist = false
|
||||||
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
|
@ -21,15 +23,12 @@ commands =
|
||||||
ostestr {posargs}
|
ostestr {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands = flake8
|
commands = flake8
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
PYTHON=coverage run --source os_testr --parallel-mode
|
PYTHON=coverage run --source os_testr --parallel-mode
|
||||||
|
@ -40,19 +39,17 @@ commands =
|
||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands = python setup.py build_sphinx
|
commands =
|
||||||
|
sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
basepython = python3
|
|
||||||
commands = oslo_debug_helper {posargs}
|
commands = oslo_debug_helper {posargs}
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
@ -67,8 +64,9 @@ whitelist_externals = rm
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
# E731 skipped as assign a lambda expression
|
# E731 skipped as assign a lambda expression
|
||||||
# H405 skipped as it wrongly recognizes a multiline string as docstring
|
# H405 skipped as it wrongly recognizes a multiline string as docstring
|
||||||
|
# W504 line break after binary operator (W503 and W504 are incompatible
|
||||||
|
# and we need to choose one of them.
|
||||||
show-source = True
|
show-source = True
|
||||||
ignore = E123,E125,E731,H405
|
ignore = E123,E125,E731,H405,W504
|
||||||
builtins = _
|
builtins = _
|
||||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
|
||||||
|
|
Loading…
Reference in New Issue