openstack
/
cinder-specs
Code Issues Proposed changes

Merge "[ussuri][goal] Drop python 2.7 support"

This commit is contained in:
Zuul 2019-12-13 22:22:43 +00:00 committed by Gerrit Code Review
parent a740bb0a72 4f13d5906a
commit e005643b63
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/requirements.txt
View File

@ -3,6 +3,5 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
openstackdocstheme>=1.11.0 openstackdocstheme>=1.11.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;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
yasfb>=0.5.1 yasfb>=0.5.1

1
test-requirements.txt
View File

@ -3,7 +3,6 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
openstackdocstheme>=1.11.0 openstackdocstheme>=1.11.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;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
flake8 flake8
yasfb>=0.5.1 yasfb>=0.5.1

7
tox.ini
View File

@ -1,9 +1,11 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.1
envlist = docs,pep8 envlist = docs,pep8
skipsdist = True skipsdist = True
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = setenv =
@ -11,7 +13,6 @@ setenv =
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
[testenv:docs] [testenv:docs]
basepython = python3
whitelist_externals = rm whitelist_externals = rm
commands = commands =
rm -fr doc/build rm -fr doc/build
@ -19,13 +20,11 @@ commands =
doc8 --ignore D001 doc/source doc8 --ignore D001 doc/source
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
flake8 flake8
doc8 --ignore D001 specs/ doc8 --ignore D001 specs/
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[flake8] [flake8]