Updated files with 'repo_helper'.

domdfcoding · Dec 21, 2020 · 57def9d · 57def9d
1 parent 9085704
commit 57def9d
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 33 deletions.
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Run:
-    name: "mypy"
+    name: "mypy / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
     strategy:

diff --git a/.github/workflows/python_ci.yml b/.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:
@@ -42,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 }}"
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -9,7 +9,7 @@ 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:
@@ -43,10 +43,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 }}"
@@ -70,7 +70,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
@@ -79,12 +79,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"
@@ -103,23 +103,27 @@ jobs:
     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:

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -9,7 +9,7 @@ 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:
@@ -42,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 }}"
diff --git a/README.rst b/README.rst
@@ -18,13 +18,15 @@ domplotlib
 	* - Docs
 	  - |docs| |docs_check|
 	* - Tests
-	  - |actions_linux| |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/domplotlib/latest?logo=read-the-docs
 	:target: https://domplotlib.readthedocs.io/en/latest
@@ -46,6 +48,14 @@ domplotlib
 	:target: https://github.com/domdfcoding/domplotlib/actions?query=workflow%3A%22macOS%22
 	:alt: macOS Test Status
 
+.. |actions_flake8| image:: https://github.com/domdfcoding/domplotlib/workflows/Flake8/badge.svg
+	:target: https://github.com/domdfcoding/domplotlib/actions?query=workflow%3A%22Flake8%22
+	:alt: Flake8 Status
+
+.. |actions_mypy| image:: https://github.com/domdfcoding/domplotlib/workflows/mypy/badge.svg
+	:target: https://github.com/domdfcoding/domplotlib/actions?query=workflow%3A%22mypy%22
+	:alt: mypy status
+
 .. |requires| image:: https://requires.io/github/domdfcoding/domplotlib/requirements.svg?branch=master
 	:target: https://requires.io/github/domdfcoding/domplotlib/requirements/?branch=master
 	:alt: Requirements Status
@@ -92,9 +102,9 @@ domplotlib
 .. |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/domplotlib
+	:target: https://pypi.org/project/domplotlib/
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/domplotlib/master.svg
 	:target: https://results.pre-commit.ci/latest/github/domdfcoding/domplotlib/master

diff --git a/doc-source/index.rst b/doc-source/index.rst
@@ -17,13 +17,15 @@ domplotlib
 	* - Docs
 	  - |docs| |docs_check|
 	* - Tests
-	  - |actions_linux| |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| rtfd-shield::
 	:project: domplotlib
@@ -45,6 +47,14 @@ domplotlib
 	:workflow: macOS
 	:alt: macOS Test Status
 
+.. |actions_flake8| actions-shield::
+	:workflow: Flake8
+	:alt: Flake8 Status
+
+.. |actions_mypy| actions-shield::
+	:workflow: mypy
+	:alt: mypy status
+
 .. |requires| requires-io-shield::
 	:alt: Requirements Status
 
@@ -93,8 +103,10 @@ domplotlib
 .. |maintained| maintained-shield:: 2020
 	:alt: Maintenance
 
-.. |pre_commit| pre-commit-shield::
-	:alt: pre-commit
+.. |pypi-downloads| pypi-shield::
+	:project: domplotlib
+	:downloads: month
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| pre-commit-ci-shield::
 	:alt: pre-commit.ci status

diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
@@ -3,7 +3,7 @@ default-values>=0.2.0
 extras-require>=0.2.0
 furo>=2020.11.19b18
 seed-intersphinx-mapping>=0.1.1
-sphinx>=3.0.3
+sphinx<3.4.0,>=3.0.3
 sphinx-copybutton>=0.2.12
 sphinx-notfound-page>=0.5
 sphinx-prompt>=1.1.0

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,6 @@
 # You may add new sections, but any changes made to the following sections will be lost:
 #     * tox
 #     * envlists
-#     * gh-actions
 #     * testenv
 #     * testenv:docs
 #     * testenv:build
@@ -29,14 +28,6 @@ test = py36, py37, py38, py39, py310-dev
 qa = mypy, lint
 cov = py36, coverage
 
-[gh-actions]
-python =
-    3.6: py36, build
-    3.7: py37, build
-    3.8: py38, build
-    3.9: py39, build
-    3.10.0-alpha.3: py310-dev, build
-
 [testenv]
 setenv = PYTHONDEVMODE = 1
 deps = -r{toxinidir}/tests/requirements.txt
@@ -157,6 +148,14 @@ ignore = W002
 toplevel = domplotlib
 package = domplotlib
 
+[gh-actions]
+python =
+    3.6: py36, build
+    3.7: py37, build
+    3.8: py38, build
+    3.9: py39, build
+    3.10.0-alpha.3: py310-dev, build
+
 [pytest]
 addopts = --color yes --durations 25 --mpl
 timeout = 300