chore(ci): test pre-release versions

TheKevJames · Dec 3, 2019 · 32fe187 · 32fe187
1 parent f5851cd
commit 32fe187
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,10 +18,11 @@ jobs:
       - checkout
       - run: pip install tox tox-factor
       - run: tox -f <<parameters.tox_environment>>
+      - run: tox -e coveralls
 
   toxpypy:
     docker:
-      - image: pypy:<<parameters.docker_image>>
+      - image: pypy:<<parameters.docker_image>>-slim
     parameters:
       docker_image:
         type: string
@@ -32,6 +33,7 @@ jobs:
       - checkout
       - run: pip install tox tox-factor
       - run: tox -f <<parameters.tox_environment>>
+      - run: tox -e coveralls
 
 workflows:
   run-jobs:
@@ -40,30 +42,52 @@ workflows:
           python_version: 3.7.5
 
       - toxpy:
+          name: test-py2.7
           docker_image: '2.7'
           tox_environment: py27
       - toxpy:
+          name: test-py3.4
           docker_image: '3.4'
           tox_environment: py34
       - toxpy:
+          name: test-py3.5
           docker_image: '3.5'
           tox_environment: py35
       - toxpy:
+          name: test-py3.6
           docker_image: '3.6'
           tox_environment: py36
       - toxpy:
+          name: test-py3.7
           docker_image: '3.7'
           tox_environment: py37
+      - toxpy:
+          name: test-py3.8
+          docker_image: '3.8'
+          tox_environment: py38
 
       - toxpypy:
-          docker_image: 2-5.8.0
+          name: test-pypy2-5
+          docker_image: 2-5
+          tox_environment: pypy
+      - toxpypy:
+          name: test-pypy2-6
+          docker_image: 2-6
           tox_environment: pypy
       - toxpypy:
-          docker_image: 2-6.0.0
+          name: test-pypy2-7
+          docker_image: 2-7
           tox_environment: pypy
+
+      - toxpypy:
+          name: test-pypy3-5
+          docker_image: 3-5
+          tox_environment: pypy3
       - toxpypy:
-          docker_image: 3-5.8.0
+          name: test-pypy3-6
+          docker_image: 3-6
           tox_environment: pypy3
       - toxpypy:
-          docker_image: 3-6.0.0
+          name: test-pypy3-7
+          docker_image: 3-7
           tox_environment: pypy3
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -4,12 +4,11 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,18 @@
 sudo: false
+
 language: python
 python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
+  - 3.7
+  - 3.8
   - pypy
-env:
-  - $COVPYYAML=cov3-default,coveralls3
-  - $COVPYYAML=cov4-pyyaml,coveralls4
-  - $COVPYYAML=cov41-pyyaml,coveralls41
-matrix:
-  include:
-    - python: 3.6
-      env: $COVPYYAML=cov41-pyyaml,coveralls41
-    - python: 3.7
-      dist: xenial  # https://github.com/travis-ci/travis-ci/issues/9815
-      sudo: true
-      env: $COVPYYAML=cov41-pyyaml,coveralls41
-    - python: pypy3
-      env: $COVPYYAML=cov41-pyyaml,coveralls41
+  - pypy3
+
 install:
   - pip install tox
+
 script:
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$COVPYYAML
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-cov41-pyyaml
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-envlist = py{27,34,35,py,py3}-cov{3,4,41,5}-{default,pyyaml},py{36,37}-cov{41,5}-{default,pyyaml}
+envlist = py{27,34,35,py,py3}-cov{3,4,41}-{default,pyyaml},py{36,37,38}-cov{41,5}-{default,pyyaml}
 
 [gh-actions]
 python =
     2.7: py27
     3.5: py35
     3.6: py36
     3.7: py37
+    3.8: py38
 
 [testenv]
 passenv = *
@@ -24,26 +25,8 @@ commands =
     coverage run --branch --source=coveralls -m pytest tests/
     coverage report -m
 
-[testenv:coveralls3]
+[testenv:coveralls]
 deps =
-    coverage<4.0
-commands =
-    coveralls --verbose
-
-[testenv:coveralls4]
-deps =
-    coverage>=4.0,<4.1
-commands =
-    coveralls --verbose
-
-[testenv:coveralls41]
-deps =
-    coverage>=4.1,<5.0
-commands =
-    coveralls --verbose
-
-[testenv:coveralls5]
-deps =
-    coverage>=5.0
+    coverage<5.0
 commands =
     coveralls --verbose