chore(ci): synchronize py versions across cis

.circleci/config.yml

@@ -1,102 +1,69 @@
-version: 2
+version: 2.1
 
-jobs:
-  check:
-    docker:
-      - image: python:3.6
-    steps:
-      - checkout
-      - run: pip install pre-commit
-      - run: pre-commit run --all-files
+orbs:
+  linter: talkiq/linter@1
 
-  test-py27:
+jobs:
+  toxpy:
     docker:
-      - image: python:2.7-alpine
+      - image: python:<<parameters.docker_image>>-alpine
+    parameters:
+      docker_image:
+        type: string
+      # TODO: figure out `<<parameters.docker_image>>.replace('.','')`
+      tox_environment:
+        type: string
     steps:
       - run: apk add --no-cache gcc git libffi-dev musl-dev openssh-client openssl-dev
       - checkout
-      - run: pip install tox
-      - run: tox -e "py27-cov{3,4,41}-{default,pyyaml}"
-
-  test-py34:
-    docker:
-      - image: python:3.4-alpine
-    steps:
-      - run: apk add --no-cache git openssh-client
-      - checkout
-      - run: pip install tox
-      - run: tox -e "py34-cov{3,4,41}-{default,pyyaml}"
+      - run: pip install tox tox-factor
+      - run: tox -f <<parameters.tox_environment>>
 
-  test-py35:
+  toxpypy:
     docker:
-      - image: python:3.5-alpine
+      - image: pypy:<<parameters.docker_image>>
+    parameters:
+      docker_image:
+        type: string
+      # TODO: figure out `<<parameters.docker_image>>.replace('.','')`
+      tox_environment:
+        type: string
     steps:
-      - run: apk add --no-cache git openssh-client
       - checkout
-      - run: pip install tox
-      - run: tox -e "py35-cov{3,4,41}-{default,pyyaml}"
-
-  test-py36:
-    docker:
-      - image: python:3.6-alpine
-    steps:
-      - run: apk add --no-cache git openssh-client
-      - checkout
-      - run: pip install tox
-      - run: tox -e "py36-cov41-{default,pyyaml}"
-
-  test-py37:
-    docker:
-      - image: python:3.7-alpine
-    steps:
-      - run: apk add --no-cache git openssh-client
-      - checkout
-      - run: pip install tox
-      - run: tox -e "py37-cov41-{default,pyyaml}"
-
-  test-pypy2-5:
-    docker:
-      - image: pypy:2-5.8.0
-    steps:
-      - checkout
-      - run: pip install tox
-      - run: tox -e "pypy-cov{3,4,41}-{default,pyyaml}"
-
-  test-pypy2-6:
-    docker:
-      - image: pypy:2-6.0.0
-    steps:
-      - checkout
-      - run: pip install tox
-      - run: tox -e "pypy-cov{3,4,41}-{default,pyyaml}"
-
-  test-pypy3-5:
-    docker:
-      - image: pypy:3-5.8.0
-    steps:
-      - checkout
-      - run: pip install tox
-      - run: tox -e "pypy3-cov{3,4,41}-{default,pyyaml}"
-
-  test-pypy3-6:
-    docker:
-      - image: pypy:3-6.0.0
-    steps:
-      - checkout
-      - run: pip install tox
-      - run: tox -e "pypy3-cov{3,4,41}-{default,pyyaml}"
+      - run: pip install tox tox-factor
+      - run: tox -f <<parameters.tox_environment>>
 
 workflows:
-  version: 2
-  test-all-envs:
+  run-jobs:
     jobs:
-      - check
-      - test-py27
-      - test-py34
-      - test-py35
-      - test-py36
-      - test-py37
-      - test-pypy2-5
-      - test-pypy2-6
-      - test-pypy3-5
-      - test-pypy3-6
+      - linter/pre-commit:
+          python_version: 3.7.5
+
+      - toxpy:
+          docker_image: 2.7
+          tox_environment: py27
+      - toxpy:
+          docker_image: 3.4
+          tox_environment: py34
+      - toxpy:
+          docker_image: 3.5
+          tox_environment: py35
+      - toxpy:
+          docker_image: 3.6
+          tox_environment: py36
+      - toxpy:
+          docker_image: 3.7
+          tox_environment: py37
+
+      - toxpypy:
+          docker_image: 2-5.8.0
+          tox_environment: pypy
+      - toxpypy:
+          docker_image: 2-6.0.0
+          tox_environment: pypy
+      - toxpypy:
+          docker_image: 3-5.8.0
+          tox_environment: pypy3
+      - toxpypy:
+          docker_image: 3-6.0.0
+          tox_environment: pypy3

.github/workflows/pythonpackage.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7]
+        python-version: [2.7, 3.4, 3.5, 3.6, 3.7]
 
     steps:
     - uses: actions/checkout@v1

.travis.yml

@@ -19,6 +19,6 @@ matrix:
       sudo: true
       env: $COVPYYAML=cov41-pyyaml,coveralls41
 install:
-  - pip install tox
+  - pip install tox tox-factor
 script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$COVPYYAML

tox.ini

@@ -3,10 +3,10 @@ envlist = py{27,34,35,py,py3}-cov{3,4,41,5}-{default,pyyaml},py{36,37}-cov{41,5}
 
 [gh-actions]
 python =
-    2.7: py27-cov{3,4,41,5}-{default,pyyaml}
-    3.5: py35-cov{3,4,41,5}-{default,pyyaml}
-    3.6: py36-cov{41,5}-{default,pyyaml}
-    3.7: py37-cov{41,5}-{default,pyyaml}
+    2.7: py27
+    3.5: py35
+    3.6: py36
+    3.7: py37
 
 [testenv]
 passenv = *