diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-02 12:29:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-02 12:29:27 +0000 |
| commit | 3fd9649e95013cc20d2efbbbc7ef44e90ff0bdf8 (patch) | |
| tree | c816ac37dba7cb07a75d025aa6f40f3b73db586e | |
| parent | 3fe2ae7849ef963227b1cd46c5b13d646de789c3 (diff) | |
| parent | b9417cd7458f186af226b1a07b6c079c919d0918 (diff) | |
| download | kolla-3fd9649e95013cc20d2efbbbc7ef44e90ff0bdf8.tar.gz kolla-3fd9649e95013cc20d2efbbbc7ef44e90ff0bdf8.zip | |
Merge "[ussuri][goal] More cleanup for python 2.7 drop"
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index a09abef7b..7d3660476 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -5,5 +5,5 @@ doc8>=0.6.0 # Apache-2.0 openstackdocstheme>=1.19.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 diff --git a/requirements.txt b/requirements.txt index d4ef17487..9159f3119 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 docker>=2.4.2 # Apache-2.0 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.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 @@ -1,7 +1,8 @@ [tox] -minversion = 2.5.0 +minversion = 3.1 skipsdist = True envlist = pep8,py37,pypy +ignore_basepython_conflict = True [testenv] basepython = python3 |