openstack
/
kolla
Code Issues Proposed changes

Merge "[ussuri][goal] More cleanup for python 2.7 drop"

This commit is contained in:
Zuul 2020-03-02 12:29:27 +00:00 committed by Gerrit Code Review
parent 3fe2ae7849 b9417cd745
commit 3fd9649e95
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/requirements.txt
View File

@ -5,5 +5,5 @@
doc8>=0.6.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0
openstackdocstheme>=1.19.0 # Apache-2.0 openstackdocstheme>=1.19.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD sphinx>=1.8.0,!=2.1.0 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD

2
requirements.txt
View File

@ -4,7 +4,7 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0 docker>=2.4.2 # Apache-2.0
Jinja2>=2.8 # BSD License (3 clause) Jinja2>=2.8 # BSD License (3 clause)
GitPython>=1.0.1;python_version>='3.0' # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause)
oslo.config>=5.1.0 # Apache-2.0 oslo.config>=5.1.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0 # PSF/ZPL setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0 # PSF/ZPL

3
tox.ini
View File

@ -1,7 +1,8 @@
[tox] [tox]
minversion = 2.5.0 minversion = 3.1
skipsdist = True skipsdist = True
envlist = pep8,py37,pypy envlist = pep8,py37,pypy
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3 basepython = python3