From e29180c5d835b30377987df445e2a869c18991bb Mon Sep 17 00:00:00 2001
From: Maeva Pourpoint <maeva@passcal.nmt.edu>
Date: Wed, 9 Sep 2020 16:13:41 -0600
Subject: [PATCH] Update tox.ini and .gitlab-ci.yml to test Python 3 code
updates
---
.gitlab-ci.yml | 21 +++++++++++++++------
tox.ini | 18 ++----------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6524a3f..1bc87f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,17 +20,26 @@ stages:
before_script:
- pip install -e .[dev]
+python3.6:
+ image: python:3.6
+ tags:
+ - passoft
+ stage: test
+ script:
+ - python -m unittest
-python2:
- image: python:2.7
+python3.7:
+ image: python:3.7
tags:
- passoft
stage: test
- script: tox -e py27
+ script:
+ - python -m unittest
-python3:
- image: python:3.6
+python3.8:
+ image: python:3.8
tags:
- passoft
stage: test
- script: tox -e py36
+ script:
+ - python -m unittest
diff --git a/tox.ini b/tox.ini
index 5482bdf..bf6c072 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,5 @@
[tox]
-envlist = py27, py36 flake8
-
-[travis]
-python =
- 2.7: py27
- 3.6: py36
-
-[testenv:flake8]
-basepython = python
-deps = flake8
-commands = flake8 fixhdr
+envlist = py36, py37, py38
[testenv]
-setenv =
- PYTHONPATH = {toxinidir}
-commands=python setup.py test
-
-
+commands = python -m unittest
--
GitLab