From 76ac68aa007313d570c4a1a379647036dbbd75f0 Mon Sep 17 00:00:00 2001
From: Bram Daams <B.Daams@science.ru.nl>
Date: Thu, 9 Apr 2020 23:18:48 +0200
Subject: [PATCH 1/2] testing with tox

---
 .gitlab-ci.yml |  6 +++++-
 tox.ini        | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d73ce22..dc01e8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "python:3.7"
+image: "painless/tox"
 
 before_script:
   - python --version
@@ -23,3 +23,7 @@ pylint:
 pytest:
   stage: Unit testing
   script: make test
+
+tox:
+  stage: Unit testing
+  script: tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..d4e7a00
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,13 @@
+# tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py35, py36, py37, py38
+
+[testenv]
+deps =
+    pytest
+commands =
+    pytest
-- 
GitLab


From 2ab2abbb7c68fe13160442c290518600d3babff6 Mon Sep 17 00:00:00 2001
From: Bram Daams <B.Daams@science.ru.nl>
Date: Thu, 9 Apr 2020 23:23:22 +0200
Subject: [PATCH 2/2] no need for make test

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc01e8c..73bcdaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,10 +20,6 @@ pylint:
   script:
   - pylint -d C0301 setup.py sch/*.py
 
-pytest:
-  stage: Unit testing
-  script: make test
-
 tox:
   stage: Unit testing
   script: tox
-- 
GitLab