diff options
| author | Ghanshyam Mann <gmann@ghanshyammann.com> | 2020-02-29 15:04:25 -0600 |
|---|---|---|
| committer | Ghanshyam Mann <gmann@ghanshyammann.com> | 2020-02-29 15:23:25 -0600 |
| commit | b9417cd7458f186af226b1a07b6c079c919d0918 (patch) | |
| tree | 7d5736b447229b082c31a5b7f875448e77424cb8 | |
| parent | 74d5a66e6bf744ad936d702443a8d64be86441ba (diff) | |
| download | kolla-b9417cd7458f186af226b1a07b6c079c919d0918.tar.gz kolla-b9417cd7458f186af226b1a07b6c079c919d0918.zip | |
[ussuri][goal] More cleanup for python 2.7 drop
Cleanup requirement and set ignore_basepython_conflict = True
in tox to avoid python version conflict warning which going
to be error in future.
Change-Id: Ia749d558df33f475dfdbe7a1f9dfdb30aeba8da0
| -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 |