From 1d4de22dad62e642f3530927fbb3d261831e6927 Mon Sep 17 00:00:00 2001
From: JensDiemer <git@jensdiemer.de>
Date: Sat, 18 Jan 2020 19:54:45 +0100
Subject: fix github actions adn Travis CI

---
 .coveragerc                     |  4 +++-
 .github/workflows/pythonapp.yml | 29 +++++++++++++++++++++++++----
 .travis.yml                     | 10 ++++++----
 Makefile                        | 14 +++++++++++++-
 tox.ini                         |  2 +-
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index b7b7ca6..deb1a12 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,9 +1,11 @@
 [run]
 branch = True
 source = creole
+omit =
+    */tests/*
+    */site-packages/*
 
 [report]
-omit = ../*migrations*,../*tests*,../*compat.*
 # Regexes for lines to exclude from consideration
 exclude_lines =
     # Have to re-enable the standard pragma
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 2480f8a..a244f20 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -19,10 +19,31 @@ jobs:
         make install
 
     - name: List installed packages
-      run: poetry run pip freeze
+      run: |
+        source $HOME/.poetry/env
+        poetry run pip freeze
+
+    - name: List all tox test environments
+      run: |
+        source $HOME/.poetry/env
+        make tox-listenvs
 
 #    - name: Run linters
-#      run: make lint
+#      run: |
+#        source $HOME/.poetry/env
+#        make lint
 
-    - name: Run pytest via tox
-      run: make tox
+    - name: Run tests with Python v3.8
+      run: |
+        source $HOME/.poetry/env
+        make tox-py38
+
+    - name: Run tests with Python v3.7
+      run: |
+        source $HOME/.poetry/env
+        make tox-py37
+
+    - name: Run tests with Python v3.6
+      run: |
+        source $HOME/.poetry/env
+        make tox-py36
diff --git a/.travis.yml b/.travis.yml
index 1b38fc6..c2d158e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,18 +3,20 @@
 language: python
 
 python:
-  - "3.6"
-  - "3.7"
   - "3.8"
+  - "3.7"
+  - "3.6"
   - "pypy3"
 
 install:
+  - make install-poetry
+  - source $HOME/.poetry/env
   - make install
   - poetry run pip freeze
+  - make tox-listenvs
 
 script:
-  - make test
-  - make lint
+  - make pytest
 
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
index a3988c3..f30b469 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,21 @@ fix-code-style: ## Fix code formatting
 # 	poetry run isort --apply --recursive creole
 	poetry run autopep8 --ignore-local-config --max-line-length=${MAX_LINE_LENGTH} --aggressive --aggressive --in-place --recursive creole
 
-tox: check-poetry ## Run pytest via tox
+tox-listenvs: check-poetry ## List all tox test environments
+	poetry run tox --listenvs
+
+tox: check-poetry ## Run pytest via tox with all environments
 	poetry run tox
 
+tox-py36: check-poetry ## Run pytest via tox with *python v3.6*
+	poetry run tox -e py36
+
+tox-py37: check-poetry ## Run pytest via tox with *python v3.7*
+	poetry run tox -e py37
+
+tox-py38: check-poetry ## Run pytest via tox with *python v3.8*
+	poetry run tox -e py38
+
 pytest: check-poetry ## Run pytest
 	poetry run pytest
 
diff --git a/tox.ini b/tox.ini
index 479fc65..788b10a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,5 +11,5 @@ whitelist_externals = make
 commands =
     make install
     make pytest
-    make lint
+;    make lint
 
-- 
cgit v1.2.1