tox: Fix the tox.ini's to support older versions of tox

The src/cephadm/tox.ini and src/pybind/mgr/tox.ini both don't run
on older versions of tox.
When using tox 2.9.1 both fail for different reasons.

`src/cephadm/tox.ini` fails because `skipsdist=true` only works if it's
directly under the `[tox]` section.

`src/pybind/mgr/tox.ini` fails because older versions of tox can't find
the requirements.txt because they don't like whitespace between the `-r`
and `requirements.txt`.

This patch changes the tox.ini's to be backwards compatible for those
who happen to be running slightly older version of tox.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit a1fd9d11e7e11a2478f268251a4a02f2d260fc1c)

diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 66edfe99f2ac29919dc0a61fbb4926b2839df958..59d94a4c4c0f84c002189fe1031cde27f1ac6d60 100644 (file)
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist = py27, py3, mypy
+skipsdist=true
 
 [testenv]
-skipsdist=true
 skip_install=true
 deps =
   pytest

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 10694f05995e1aa4891c719df34760b9fbedeb7f..d04c889db0a5e76ff93ade4622a65ef881c49f80 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -10,14 +10,14 @@ setenv =
     LD_LIBRARY_PATH = ../../../build/lib
 deps =
     cython
-    -r requirements.txt
+    -rrequirements.txt
 commands = pytest -v --cov --cov-append --cov-report= --doctest-modules {posargs:mgr_util.py tests/ cephadm/ pg_autoscaler/ progress/}
 
 [testenv:mypy]
 basepython = python3
 deps =
     cython
-    -r requirements.txt
+    -rrequirements.txt
     mypy==0.770
 commands = mypy --config-file=../../mypy.ini \
            cephadm/module.py \