[repo-helper] Configuration Update

.github/actions_build_conda.sh

@@ -15,10 +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
+conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
 
 exit 0

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# This file is managed by 'repo_helper'. Don't edit it directly.
+---
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: /
+  schedule:
+    interval: weekly
+  reviewers:
+  - domdfcoding

.github/workflows/conda_ci.yml

@@ -29,16 +29,16 @@ jobs:
           python -m pip install --upgrade repo_helper
           # $CONDA is an environment variable pointing to the root of the miniconda directory
           $CONDA/bin/conda update -q conda
-
-          $CONDA/bin/conda config --add channels domdfcoding
+          $CONDA/bin/conda install conda-build
 
           $CONDA/bin/conda config --add channels conda-forge
-
+          $CONDA/bin/conda config --add channels domdfcoding
 
       - name: "Build and install package"
         run: |
           # This mess is only necessary because conda won't fix it themselves
           # https://github.com/conda/conda/issues/1884
 
           python -m repo_helper build --conda --out-dir conda-bld/noarch
-          $CONDA/bin/conda install consolekit -c local -y || exit 1
+          $CONDA/bin/conda index ./conda-bld || exit 1
+          $CONDA/bin/conda install -c file://$(pwd)/conda-bld consolekit -y || exit 1

.github/workflows/mypy.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   Run:
-    name: "mypy"
+    name: "mypy / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
-          python-version: "3.8"
+          python-version: "3.6"
 
       - name: Install dependencies 🔧
         run: |

.github/workflows/octocheese.yml

@@ -4,6 +4,7 @@
 name: "GitHub Releases"
 on:
   push:
+    branches: ["master"]
   schedule:
     - cron: 0 12 * * 2,4,6
 

.github/workflows/python_ci.yml

@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: Windows Tests
+name: Windows
 
 on:
   push:
@@ -9,19 +9,21 @@ 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:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
 
     strategy:
       fail-fast: False
       matrix:
         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: "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: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
@@ -40,4 +42,4 @@ jobs:
           python -m pip install --upgrade tox virtualenv
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
-        run: "python -m tox -e ${{ matrix.config.testenvs }}"
+        run: python -m tox -e "${{ matrix.config.testenvs }}"

.github/workflows/python_ci_linux.yml

@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: Linux Tests
+name: Linux
 
 on:
   push:
@@ -9,20 +9,22 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.config.python-version }}"
-    runs-on: "ubuntu-18.04"
+    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,3.9,pypy3'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
 
     strategy:
       fail-fast: False
       matrix:
         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"}
+          - {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: "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 🛎️
@@ -42,10 +44,10 @@ jobs:
           python -m pip install --upgrade coverage_pyver_pragma
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
-        run: "python -m tox -e ${{ matrix.config.testenvs }}"
+        run: python -m tox -e "${{ matrix.config.testenvs }}"
 
 
-      - name: "Upload Coverage"
+      - name: "Upload Coverage 🚀"
         uses: actions/upload-artifact@v2
         with:
           name: "coverage-${{ matrix.config.python-version }}"
@@ -54,7 +56,7 @@ jobs:
 
   Coverage:
     needs: tests
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
@@ -69,7 +71,7 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade coveralls coverage_pyver_pragma
 
-      - name: "Download Coverage"
+      - name: "Download Coverage 🪂"
         uses: actions/download-artifact@v2
         with:
           path: coverage
@@ -78,12 +80,12 @@ jobs:
         run: ls -R
         working-directory: coverage
 
-      - name: Combine Coverage
+      - name: Combine Coverage 👷
         run: |
           shopt -s globstar
           python -m coverage combine coverage/**/.coverage
 
-      - name: "Upload Combined Coverage Artefact"
+      - name: "Upload Combined Coverage Artefact 🚀"
         uses: actions/upload-artifact@v2
         with:
           name: "combined-coverage"
@@ -98,27 +100,31 @@ jobs:
   Deploy:
     needs: tests
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
           python-version: 3.8
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Install dependencies 🔧
         run: |
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install --upgrade tox
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Build distributions 📦
         run: |
           tox -e build
 
+        if: startsWith(github.ref, 'refs/tags/')
 
-      - name: Upload distribution 📦 to PyPI
+      - name: Upload distribution to PyPI 🚀
         if: startsWith(github.ref, 'refs/tags/')
         uses: pypa/gh-action-pypi-publish@master
         with:
@@ -130,7 +136,8 @@ jobs:
 
   Conda:
     needs: deploy
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
+    if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
@@ -154,7 +161,6 @@ jobs:
           bash .github/actions_build_conda.sh
 
       - name: Deploy Conda 🚀
-        if: startsWith(github.ref, 'refs/tags/')
         run: |
           chmod +x .github/actions_deploy_conda.sh
           bash .github/actions_deploy_conda.sh

.github/workflows/python_ci_macos.yml

@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: macOS Tests
+name: macOS
 
 on:
   push:
@@ -9,20 +9,22 @@ 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,3.9,pypy3'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
 
     strategy:
       fail-fast: False
       matrix:
         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"}
+          - {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: "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 🛎️
@@ -41,4 +43,4 @@ jobs:
           python -m pip install --upgrade tox virtualenv
 
       - name: "Run Tests for Python ${{ matrix.config.python-version }}"
-        run: "python -m tox -e ${{ matrix.config.testenvs }}"
+        run: python -m tox -e "${{ matrix.config.testenvs }}"

README.rst

@@ -19,15 +19,17 @@ Spun out from `repo_helper <https://github.com/domdfcoding/repo_helper>`_. Needs
 	* - Docs
 	  - |docs| |docs_check|
 	* - Tests
-	  - |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
+	  - |actions_linux| |actions_windows| |actions_macos| |coveralls|
 	* - PyPI
 	  - |pypi-version| |supported-versions| |supported-implementations| |wheel|
 	* - Anaconda
 	  - |conda-version| |conda-platform|
 	* - Activity
-	  - |commits-latest| |commits-since| |maintained|
+	  - |commits-latest| |commits-since| |maintained| |pypi-downloads|
+	* - QA
+	  - |codefactor| |actions_flake8| |actions_mypy| |pre_commit_ci|
 	* - Other
-	  - |license| |language| |requires| |pre_commit|
+	  - |license| |language| |requires|
 
 .. |docs| image:: https://img.shields.io/readthedocs/consolekit/latest?logo=read-the-docs
 	:target: https://consolekit.readthedocs.io/en/latest
@@ -37,18 +39,26 @@ Spun out from `repo_helper <https://github.com/domdfcoding/repo_helper>`_. Needs
 	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Docs+Check%22
 	:alt: Docs Check Status
 
-.. |travis| image:: https://github.com/domdfcoding/consolekit/workflows/Linux%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Linux+Tests%22
+.. |actions_linux| image:: https://github.com/domdfcoding/consolekit/workflows/Linux/badge.svg
+	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Linux%22
 	:alt: Linux Test Status
 
-.. |actions_windows| image:: https://github.com/domdfcoding/consolekit/workflows/Windows%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Windows+Tests%22
+.. |actions_windows| image:: https://github.com/domdfcoding/consolekit/workflows/Windows/badge.svg
+	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Windows%22
 	:alt: Windows Test Status
 
-.. |actions_macos| image:: https://github.com/domdfcoding/consolekit/workflows/macOS%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22macOS+Tests%22
+.. |actions_macos| image:: https://github.com/domdfcoding/consolekit/workflows/macOS/badge.svg
+	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22macOS%22
 	:alt: macOS Test Status
 
+.. |actions_flake8| image:: https://github.com/domdfcoding/consolekit/workflows/Flake8/badge.svg
+	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22Flake8%22
+	:alt: Flake8 Status
+
+.. |actions_mypy| image:: https://github.com/domdfcoding/consolekit/workflows/mypy/badge.svg
+	:target: https://github.com/domdfcoding/consolekit/actions?query=workflow%3A%22mypy%22
+	:alt: mypy status
+
 .. |requires| image:: https://requires.io/github/domdfcoding/consolekit/requirements.svg?branch=master
 	:target: https://requires.io/github/domdfcoding/consolekit/requirements/?branch=master
 	:alt: Requirements Status
@@ -103,9 +113,9 @@ Spun out from `repo_helper <https://github.com/domdfcoding/repo_helper>`_. Needs
 .. |maintained| image:: https://img.shields.io/maintenance/yes/2020
 	:alt: Maintenance
 
-.. |pre_commit| image:: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white
-	:target: https://github.com/pre-commit/pre-commit
-	:alt: pre-commit
+.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/consolekit
+	:target: https://pypi.org/project/consolekit/
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/consolekit/master.svg
 	:target: https://results.pre-commit.ci/latest/github/domdfcoding/consolekit/master
@@ -132,8 +142,8 @@ To install with ``conda``:
 
 	.. code-block:: bash
 
-		$ conda config --add channels http://conda.anaconda.org/domdfcoding
 		$ conda config --add channels http://conda.anaconda.org/conda-forge
+		$ conda config --add channels http://conda.anaconda.org/domdfcoding
 
 	* Then install