Merge 42413d6 into 55857dd

repo-helper · Dec 8, 2020 · 73795c8 · 73795c8
2 parents 55857dd + 42413d6
commit 73795c8
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 20 deletions.
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -0,0 +1,36 @@
+# This file is managed by 'repo_helper'. Don't edit it directly.
+---
+name: mypy
+
+on:
+  push:
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  Run:
+    name: "mypy"
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - name: Checkout 🛎️
+        uses: "actions/checkout@v2"
+
+      - name: Setup Python 🐍
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "3.8"
+
+      - name: Install dependencies 🔧
+        run: |
+          python -VV
+          python -m site
+          python -m pip install --upgrade pip setuptools wheel
+          python -m pip install tox
+
+      - name: "Run mypy"
+        run: "python -m tox -e mypy"
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -9,15 +9,19 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.python-version }}"
+    name: "Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2019"
     env:
       USING_COVERAGE: '3.6,3.7,3.8,3.9'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9"]
+        config:
+          - {python-version: "3.6", testenvs: "py36,build"}
+          - {python-version: "3.7", testenvs: "py37,build"}
+          - {python-version: "3.8", testenvs: "py38,build"}
+          - {python-version: "3.9", testenvs: "py39,build"}
 
     steps:
       - name: Checkout 🛎️
@@ -26,14 +30,14 @@ jobs:
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
-          python-version: "${{ matrix.python-version }}"
+          python-version: "${{ matrix.config.python-version }}"
 
       - name: Install dependencies 🔧
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox tox-gh-actions virtualenv
+          python -m pip install --upgrade tox virtualenv
 
-      - name: "Run Tests for Python ${{ matrix.python-version }}"
-        run: "python -m tox"
+      - name: "Run Tests for Python ${{ matrix.config.python-version }}"
+        run: "python -m tox -e ${{ matrix.config.testenvs }}"
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -9,15 +9,20 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.python-version }}"
+    name: "Python ${{ matrix.config.python-version }}"
     runs-on: "ubuntu-18.04"
     env:
       USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy3'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","pypy3"]
+        config:
+          - {python-version: "3.6", testenvs: "py36,build"}
+          - {python-version: "3.7", testenvs: "py37,build"}
+          - {python-version: "3.8", testenvs: "py38,build"}
+          - {python-version: "3.9", testenvs: "py39,build"}
+          - {python-version: "pypy3", testenvs: "pypy3,build"}
 
     steps:
       - name: Checkout 🛎️
@@ -26,24 +31,24 @@ jobs:
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
-          python-version: "${{ matrix.python-version }}"
+          python-version: "${{ matrix.config.python-version }}"
 
       - name: Install dependencies 🔧
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox tox-gh-actions virtualenv
+          python -m pip install --upgrade tox virtualenv
           python -m pip install --upgrade coverage_pyver_pragma
 
-      - name: "Run Tests for Python ${{ matrix.python-version }}"
-        run: "python -m tox"
+      - name: "Run Tests for Python ${{ matrix.config.python-version }}"
+        run: "python -m tox -e ${{ matrix.config.testenvs }}"
 
 
       - name: "Upload Coverage"
         uses: actions/upload-artifact@v2
         with:
-          name: "coverage-${{ matrix.python-version }}"
+          name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
 
 

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -9,15 +9,20 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.python-version }}"
+    name: "Python ${{ matrix.config.python-version }}"
     runs-on: "macos-latest"
     env:
       USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy3'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","pypy3"]
+        config:
+          - {python-version: "3.6", testenvs: "py36,build"}
+          - {python-version: "3.7", testenvs: "py37,build"}
+          - {python-version: "3.8", testenvs: "py38,build"}
+          - {python-version: "3.9", testenvs: "py39,build"}
+          - {python-version: "pypy3", testenvs: "pypy3,build"}
 
     steps:
       - name: Checkout 🛎️
@@ -26,14 +31,14 @@ jobs:
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
-          python-version: "${{ matrix.python-version }}"
+          python-version: "${{ matrix.config.python-version }}"
 
       - name: Install dependencies 🔧
         run: |
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox tox-gh-actions virtualenv
+          python -m pip install --upgrade tox virtualenv
 
-      - name: "Run Tests for Python ${{ matrix.python-version }}"
-        run: "python -m tox"
+      - name: "Run Tests for Python ${{ matrix.config.python-version }}"
+        run: "python -m tox -e ${{ matrix.config.testenvs }}"
diff --git a/tox.ini b/tox.ini
@@ -29,7 +29,7 @@ cov = py36, coverage
 [gh-actions]
 python =
     3.6: py36, build
-    3.7: py37, build, mypy
+    3.7: py37, build
     3.8: py38, build
     3.9: py39, build
     pypy3: pypy3, build