[repo-helper] Configuration Update

.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/flake8.yml

@@ -26,8 +26,7 @@ jobs:
           python -VV
           python -m site
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install flake8-prettycount
-          python -m pip install .
+          python -m pip install tox
 
       - name: "Run Flake8"
-        run: "python -m flake8_prettycount flake8_github_action --format github"
+        run: "python -m tox -e lint -- --format github"

.github/workflows/mypy.yml

@@ -0,0 +1,37 @@
+# This file is managed by 'repo_helper'. Don't edit it directly.
+---
+name: mypy
+
+on:
+  push:
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  Run:
+    name: "mypy / ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+      fail-fast: false
+
+    steps:
+      - name: Checkout 🛎️
+        uses: "actions/checkout@v2"
+
+      - name: Setup Python 🐍
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "3.6"
+
+      - 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"

.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,15 +9,20 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.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'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9"]
+        config:
+          - {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}
 
     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 }}"

.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,15 +9,20 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.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'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9"]
+        config:
+          - {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}
 
     steps:
       - name: Checkout 🛎️
@@ -26,30 +31,30 @@ 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"
+      - name: "Upload Coverage 🚀"
         uses: actions/upload-artifact@v2
         with:
-          name: "coverage-${{ matrix.python-version }}"
+          name: "coverage-${{ matrix.config.python-version }}"
           path: .coverage
 
 
   Coverage:
     needs: tests
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
@@ -64,7 +69,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
@@ -73,12 +78,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"
@@ -93,27 +98,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:

.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,15 +9,20 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ matrix.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'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9"]
+        config:
+          - {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}
 
     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 }}"

.pre-commit-config.yaml

@@ -44,6 +44,9 @@ repos:
    rev: v1.7.0
    hooks:
     - id: python-no-eval
+    - id: rst-backticks
+    - id: rst-directive-colons
+    - id: rst-inline-touching-normal
 
  - repo: https://github.com/asottile/pyupgrade
    rev: v2.7.4

README.rst

@@ -17,34 +17,44 @@ notebook2script
 	* - 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|
 	* - 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/notebook2script/latest?logo=read-the-docs
-	:target: https://notebook2script.readthedocs.io/en/latest/?badge=latest
+	:target: https://notebook2script.readthedocs.io/en/latest
 	:alt: Documentation Build Status
 
 .. |docs_check| image:: https://github.com/domdfcoding/notebook2script/workflows/Docs%20Check/badge.svg
 	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Docs+Check%22
 	:alt: Docs Check Status
 
-.. |travis| image:: https://github.com/domdfcoding/notebook2script/workflows/Linux%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Linux+Tests%22
+.. |actions_linux| image:: https://github.com/domdfcoding/notebook2script/workflows/Linux/badge.svg
+	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Linux%22
 	:alt: Linux Test Status
 
-.. |actions_windows| image:: https://github.com/domdfcoding/notebook2script/workflows/Windows%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Windows+Tests%22
+.. |actions_windows| image:: https://github.com/domdfcoding/notebook2script/workflows/Windows/badge.svg
+	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Windows%22
 	:alt: Windows Test Status
 
-.. |actions_macos| image:: https://github.com/domdfcoding/notebook2script/workflows/macOS%20Tests/badge.svg
-	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22macOS+Tests%22
+.. |actions_macos| image:: https://github.com/domdfcoding/notebook2script/workflows/macOS/badge.svg
+	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22macOS%22
 	:alt: macOS Test Status
 
+.. |actions_flake8| image:: https://github.com/domdfcoding/notebook2script/workflows/Flake8/badge.svg
+	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Flake8%22
+	:alt: Flake8 Status
+
+.. |actions_mypy| image:: https://github.com/domdfcoding/notebook2script/workflows/mypy/badge.svg
+	:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22mypy%22
+	:alt: mypy status
+
 .. |requires| image:: https://requires.io/github/domdfcoding/notebook2script/requirements.svg?branch=master
 	:target: https://requires.io/github/domdfcoding/notebook2script/requirements/?branch=master
 	:alt: Requirements Status
@@ -91,9 +101,9 @@ notebook2script
 .. |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/notebook2script
+	:target: https://pypi.org/project/notebook2script/
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/notebook2script/master.svg
 	:target: https://results.pre-commit.ci/latest/github/domdfcoding/notebook2script/master

doc-source/conf.py

@@ -56,8 +56,6 @@
 templates_path = ["_templates"]
 html_static_path = ["_static"]
 source_suffix = ".rst"
-exclude_patterns = []
-
 master_doc = "index"
 suppress_warnings = ["image.nonlocal_uri"]
 pygments_style = "default"