Update GitHub actions config.

repo-helper · Dec 18, 2020 · 9ad3097 · 9ad3097
1 parent 322b376
commit 9ad3097
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -13,7 +13,7 @@ jobs:
     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,pypy-3.6'
 
     strategy:
       fail-fast: False
@@ -23,7 +23,7 @@ jobs:
           - {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: "pypy3", testenvs: "pypy3,build", experimental: False}
+          - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -13,7 +13,7 @@ jobs:
     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,pypy-3.6'
 
     strategy:
       fail-fast: False
@@ -23,7 +23,7 @@ jobs:
           - {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: "pypy3", testenvs: "pypy3,build", experimental: False}
+          - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️

diff --git a/README.rst b/README.rst
@@ -21,15 +21,17 @@ Note: The autocommit functionality is currently broken on Windows, but works OK
 	* - 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|
 	* - 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/repo_helper/latest?logo=read-the-docs
 	:target: https://docs.repo-helper.uk
@@ -51,6 +53,14 @@ Note: The autocommit functionality is currently broken on Windows, but works OK
 	:target: https://github.com/domdfcoding/repo_helper/actions?query=workflow%3A%22macOS%22
 	:alt: macOS Test Status
 
+.. |actions_flake8| image:: https://github.com/domdfcoding/repo_helper/workflows/Flake8/badge.svg
+	:target: https://github.com/domdfcoding/repo_helper/actions?query=workflow%3A%22Flake8%22
+	:alt: Flake8 Status
+
+.. |actions_mypy| image:: https://github.com/domdfcoding/repo_helper/workflows/mypy/badge.svg
+	:target: https://github.com/domdfcoding/repo_helper/actions?query=workflow%3A%22mypy%22
+	:alt: mypy status
+
 .. |requires| image:: https://requires.io/github/domdfcoding/repo_helper/requirements.svg?branch=master
 	:target: https://requires.io/github/domdfcoding/repo_helper/requirements/?branch=master
 	:alt: Requirements Status
@@ -105,9 +115,9 @@ Note: The autocommit functionality is currently broken on Windows, but works OK
 .. |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/repo_helper
+	:target: https://pypi.org/project/repo_helper/
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/repo_helper/master.svg
 	:target: https://results.pre-commit.ci/latest/github/domdfcoding/repo_helper/master

diff --git a/doc-source/index.rst b/doc-source/index.rst
@@ -21,15 +21,17 @@ This project is in an early stage, and some things might not work correctly or b
 	* - 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|
 	* - 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| rtfd-shield::
 	:project: repo_helper
@@ -51,6 +53,14 @@ This project is in an early stage, and some things might not work correctly or b
 	: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
 
@@ -107,8 +117,10 @@ This project is in an early stage, and some things might not work correctly or b
 .. |maintained| maintained-shield:: 2020
 	:alt: Maintenance
 
-.. |pre_commit| pre-commit-shield::
-	:alt: pre-commit
+.. |pypi-downloads| pypi-shield::
+	:project: repo_helper
+	:downloads: month
+	:alt: PyPI - Downloads
 
 .. |pre_commit_ci| pre-commit-ci-shield::
 	:alt: pre-commit.ci status

diff --git a/tox.ini b/tox.ini
@@ -34,7 +34,7 @@ python =
     3.7: py37, build
     3.8: py38, build
     3.9: py39, build
-    pypy3: pypy3, build
+    pypy-3.6: pypy3, build
 
 [testenv]
 setenv = PYTHONDEVMODE = 1