Updated CI. (#1181)

Simplify CI and speedup.

Author: janiversen

.github/workflows/ci.yml

@@ -75,6 +75,13 @@ jobs:
             matrix: 3.8
             implementation: pypy
             openssl_msvc_version: 2019
+          - name: PyPy 3.9
+            tox: pypy39
+            action: pypy-3.9
+            docker: pypy3.9
+            matrix: 3.9
+            implementation: pypy
+            openssl_msvc_version: 2019
         arch:
           - name: x86
             action: x86
@@ -95,62 +102,33 @@ jobs:
               matrix: windows
             python:
               implementation: pypy
-            arch:
-              matrix: x64
           - os:
-              matrix: windows
+              matrix: macos
             python:
               implementation: pypy
-              matrix: 3.8
     env:
       # Should match name above
       JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up ${{ matrix.python.name }} (if CPython)
         if: ${{ job.container == '' && matrix.python.implementation == 'cpython'}}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: '${{ matrix.python.action }}.0-alpha - ${{ matrix.python.action }}.X'
           architecture: '${{ matrix.arch.action }}'
       - name: Set up ${{ matrix.python.name }} (if PyPy)
         if: ${{ job.container == '' && matrix.python.implementation == 'pypy'}}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: '${{ matrix.python.action }}'
           architecture: '${{ matrix.arch.action }}'
       - name: Install
         run: |
           pip install --upgrade pip setuptools wheel
           pip install --upgrade tox
-      - name: Add PyPy Externals
-        if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}
-        env:
-          PYPY_EXTERNALS_PATH: ${{ github.workspace }}/pypy_externals
-        shell: bash
-        run: |
-          echo $PYPY_EXTERNALS_PATH
-          mkdir --parents $(dirname $PYPY_EXTERNALS_PATH)
-          hg clone https://foss.heptapod.net/pypy/externals/ $PYPY_EXTERNALS_PATH
-          dir $PYPY_EXTERNALS_PATH
-          cd $PYPY_EXTERNALS_PATH && hg update win$(python -c 'import struct; print(struct.calcsize("P") * 8)')_14x
-          echo "INCLUDE=$PYPY_EXTERNALS_PATH/include;$INCLUDE" >> $GITHUB_ENV
-          echo "LIB=$PYPY_EXTERNALS_PATH/lib;$LIB" >> $GITHUB_ENV
-#          echo "CL=${{ matrix.PYTHON.CL_FLAGS }}" >> $GITHUB_ENV
-      - name: Add Brew
-        if: ${{ matrix.os.matrix == 'macos' && matrix.python.implementation == 'pypy'}}
-        shell: bash
-        run: |
-          brew install [email protected] rust
-          echo "LDFLAGS=-L$(brew --prefix [email protected])/lib" >> $GITHUB_ENV
-          echo "CFLAGS=-I$(brew --prefix [email protected])/include" >> $GITHUB_ENV
-      - name: rustup
-        if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}
-        shell: bash
-        run: |
-          rustup target add i686-pc-windows-msvc
       - name: Test
         env:
           # When compiling Cryptography for PyPy on Windows there is a cleanup
@@ -166,7 +144,7 @@ jobs:
           cp coverage.xml "coverage_reports/coverage.${{ env.JOB_NAME }}.xml"
       - name: Upload Coverage
         if: matrix.task.coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: coverage
           path: coverage_reports/*
@@ -220,66 +198,14 @@ jobs:
       # Should match name above
       JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install
         run: |
           pip install --upgrade pip setuptools wheel
           pip install --upgrade tox
-      - name: Test
-        continue-on-error: ${{ matrix.task.continue_on_error == true }}
-        run: |
-          tox -vv -e ${{ matrix.task.tox }}
-  coverage:
-    # Should match JOB_NAME below
-    name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
-    runs-on: ${{ matrix.os.runs-on }}
-    if: always()
-    needs:
-      - test
-    container: ${{ matrix.os.container[matrix.python.docker] }}
-    strategy:
-      fail-fast: false
-      matrix:
-        task:
-          - name: Coverage
-            tox: combined-coverage
-            download_coverage: true
-        os:
-          - name: Linux
-            runs-on: ubuntu-latest
-            matrix: linux
-            container:
-              3.8: docker://python:3.8-buster
-        python:
-          - name: CPython 3.8
-            tox: py38
-            action: 3.8
-            docker: 3.8
-            implementation: cpython
-        arch:
-          - name: x64
-            action: x64
-            matrix: x64
-    env:
-      # Should match name above
-      JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.arch.name }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Install
-        run: |
-          pip install --upgrade pip setuptools wheel
-          pip install --upgrade tox
-      - name: Download Coverage
-        if: matrix.task.download_coverage
-        uses: actions/download-artifact@v2
-        with:
-          name: coverage
-          path: coverage_reports
-      - name: Test
+      - name: Test format
         continue-on-error: ${{ matrix.task.continue_on_error == true }}
         run: |
           tox -vv -e ${{ matrix.task.tox }}
@@ -288,7 +214,6 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - check
-      - coverage
       - test
     steps:
       - name: This

setup.cfg

@@ -77,6 +77,7 @@ ignore-paths=
     examples/common/tornado_twisted,
     examples/contrib/tornado_twisted,
     examples/contrib/libmodbus_client.py
+    doc
 ignore-patterns=^\.#
 
 # Pickle collected data for later comparisons.

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 # pypy38 does not work on windows, due to an internal error.
-envlist = py{38,39,310,py38}
+envlist = py{38,39,310,py38,py39}
 
 [testenv]
 deps = -r requirements.txt