QoL: Fix tox.ini syntax and other minor things

- Fix tox.ini syntax

Modern tox versions require the expected environment variables to be
listed one by one on separate lines in tox.ini

- Add `venv` to list of ignored names for git

This is a common name for a local Python virtual environment. Less
typing than `virtualenv`

- Add `tox` to requirements.txt

Installing `tox` via `pip` has the advantage of including it in the
virtual environment, thus avoiding trouble on operating systems shipping
by default with python3.6 or older. It's also nice that `pip install -r
requirements.txt` is now sufficient to set up the testing environment,
after initializing the virtual environment with a moder-enough python
version.

Signed-off-by: Moritz Röhrich <moritz.rohrich@suse.com>
(cherry picked from commit 3a0f1f0ead196c67721e94a19544aad19846f039)
(cherry picked from commit 7fadea74165dc1d117587e0d16f934aa95d6447d)

diff --git a/.gitignore b/.gitignore
index bcbae8053cc82661c2f4927b3084911629f7cfc3..2a246a8a2e5ad59a2c566233f6842921ce21a740 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,6 @@
 
 /*.egg-info
 /virtualenv
+/venv
 
 config.yaml

diff --git a/requirements.txt b/requirements.txt
index ac1d18f21ed3b048f86e931d1f29bcc3db7b21ab..7742d8fb99aa01272c5daf4bc6dea64ccfabe345 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,4 @@ pytz >=2011k
 httplib2
 lxml
 pytest
+tox

diff --git a/tox.ini b/tox.ini
index 93fde3893c8774de5e2042b0f74a228e99047cbb..e4a30e5b3f06e10720eb301afc66a4551938e394 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -3,5 +3,7 @@ envlist = py
 
 [testenv]
 deps = -rrequirements.txt
-passenv = S3TEST_CONF S3_USE_SIGV4
+passenv =
+  S3TEST_CONF
+  S3_USE_SIGV4
 commands = pytest {posargs}