Browse code
Cleanup py27 support
This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove obsolete section from setup.cfg
- Use newer openstackdocstheme and Sphinx version for python 3
- Remove install_command from tox.ini, the default is fine
- Move basepython into testenv
- Update bashate version
Change-Id: I3d78b3787af2efce831d223dbcab6cf84c358028
Andreas Jaeger authored on 2020/05/09 20:30:10Showing 3 changed files
| ... | ... |
@@ -5,15 +5,14 @@ envlist = bashate |
| 5 | 5 |
|
| 6 | 6 |
[testenv] |
| 7 | 7 |
usedevelop = False |
| 8 |
-install_command = pip install {opts} {packages}
|
|
| 8 |
+basepython = python3 |
|
| 9 | 9 |
|
| 10 | 10 |
[testenv:bashate] |
| 11 |
-basepython = python3 |
|
| 12 | 11 |
# if you want to test out some changes you have made to bashate |
| 13 | 12 |
# against devstack, just set BASHATE_INSTALL_PATH=/path/... to your |
| 14 | 13 |
# modified bashate tree |
| 15 | 14 |
deps = |
| 16 |
- {env:BASHATE_INSTALL_PATH:bashate==0.5.1}
|
|
| 15 |
+ {env:BASHATE_INSTALL_PATH:bashate==2.0.0}
|
|
| 17 | 16 |
whitelist_externals = bash |
| 18 | 17 |
commands = bash -c "find {toxinidir} \
|
| 19 | 18 |
-not \( -type d -name .?\* -prune \) \ |
| ... | ... |
@@ -35,7 +34,6 @@ commands = bash -c "find {toxinidir} \
|
| 35 | 35 |
-print0 | xargs -0 bashate -v -iE006 -eE005,E042" |
| 36 | 36 |
|
| 37 | 37 |
[testenv:docs] |
| 38 |
-basepython = python3 |
|
| 39 | 38 |
deps = -r{toxinidir}/doc/requirements.txt
|
| 40 | 39 |
whitelist_externals = bash |
| 41 | 40 |
setenv = |
| ... | ... |
@@ -44,7 +42,6 @@ commands = |
| 44 | 44 |
sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html |
| 45 | 45 |
|
| 46 | 46 |
[testenv:pdf-docs] |
| 47 |
-basepython = python3 |
|
| 48 | 47 |
deps = {[testenv:docs]deps}
|
| 49 | 48 |
whitelist_externals = |
| 50 | 49 |
make |
| ... | ... |
@@ -53,6 +50,5 @@ commands = |
| 53 | 53 |
make -C doc/build/pdf |
| 54 | 54 |
|
| 55 | 55 |
[testenv:venv] |
| 56 |
-basepython = python3 |
|
| 57 | 56 |
deps = -r{toxinidir}/doc/requirements.txt
|
| 58 | 57 |
commands = {posargs}
|