Updated CI config.

Author: domdfcoding

.github/actions_build_conda.sh

@@ -15,9 +15,9 @@ conda install conda-build
 conda install anaconda-client
 conda info -a
 
-conda config --add channels domdfcoding || exit 1
 conda config --add channels conda-forge || exit 1
+conda config --add channels domdfcoding || exit 1
 
-conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing --numpy 1.16
+conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
 
 exit 0

.github/workflows/conda_ci.yml

@@ -31,8 +31,8 @@ jobs:
           $CONDA/bin/conda update -q conda
           $CONDA/bin/conda install conda-build
 
-          $CONDA/bin/conda config --add channels domdfcoding
           $CONDA/bin/conda config --add channels conda-forge
+          $CONDA/bin/conda config --add channels domdfcoding
 
       - name: "Build and install package"
         run: |

.github/workflows/mypy.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   Run:
-    name: "mypy"
+    name: "mypy / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
     strategy:

.github/workflows/python_ci.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.config.python-version }}"
+    name: "windows-2019 / Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:

.github/workflows/python_ci_linux.yml

@@ -9,11 +9,11 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.config.python-version }}"
+    name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9,3.10.0-alpha.3'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
 
     strategy:
       fail-fast: False
@@ -22,9 +22,9 @@ jobs:
           - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
-          - {python-version: "pypy3", testenvs: "pypy3,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
@@ -99,6 +99,7 @@ jobs:
 
   Deploy:
     needs: tests
+    if: startsWith(github.ref, 'refs/tags/')
 
     runs-on: "ubuntu-20.04"
     steps:

.github/workflows/python_ci_macos.yml

@@ -9,11 +9,11 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.config.python-version }}"
+    name: "macos-latest / Python ${{ matrix.config.python-version }}"
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9,3.10.0-alpha.3'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
 
     strategy:
       fail-fast: False
@@ -22,9 +22,9 @@ jobs:
           - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
-          - {python-version: "pypy3", testenvs: "pypy3,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️