Do away with tox-gh-actions to work around issue on Linux.

Author: domdfcoding

repo_helper/configuration/__init__.py

@@ -330,10 +330,9 @@ def custom_parsing(
 		py_versions = parsed_config_vars["python_versions"]
 		tox_py_versions = get_tox_python_versions(py_versions)
 		parsed_config_vars["tox_py_versions"] = tox_py_versions
-		tox_travis_versions = get_tox_travis_python_versions(py_versions, tox_py_versions)
-		tox_travis_versions[parsed_config_vars["python_deploy_version"]] += ", mypy"
-		parsed_config_vars["tox_travis_versions"] = tox_travis_versions
-		parsed_config_vars["gh_actions_versions"] = tox_travis_versions
+		gh_actions_versions = get_gh_actions_python_versions(py_versions, tox_py_versions)
+		parsed_config_vars["tox_travis_versions"] = gh_actions_versions
+		parsed_config_vars["gh_actions_versions"] = gh_actions_versions
 
 		if (repo_path / parsed_config_vars["import_name"].replace('.', '/') / "py.typed").is_file():
 			parsed_config_vars["classifiers"].append("Typing :: Typed")

repo_helper/core.py

@@ -42,7 +42,7 @@
 from repo_helper.files.linting import code_only_warning, lint_warn_list
 from repo_helper.files.testing import make_isort
 from repo_helper.templates import init_repo_template_dir, template_dir
-from repo_helper.utils import discover_entry_points
+from repo_helper.utils import brace, discover_entry_points
 
 __all__ = [
 		"RepoHelper",
@@ -92,6 +92,7 @@ def __init__(
 			undefined=jinja2.StrictUndefined,
 			)
 		self.templates.globals["managed_message"] = managed_message
+		self.templates.globals["brace"] = brace
 
 		self.load_settings()
 

repo_helper/files/ci_cd.py

@@ -42,6 +42,7 @@
 		"make_github_docs_test",
 		"make_github_octocheese",
 		"make_github_flake8",
+		"make_github_mypy",
 		"make_github_manylinux",
 		"ensure_bumpversion",
 		"make_actions_deploy_conda",
@@ -104,7 +105,8 @@ def make_github_ci(repo_path: pathlib.Path, templates: jinja2.Environment) -> Li
 			"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 tox-gh-actions virtualenv",
+			"python -m pip install --upgrade tox virtualenv",
 			]
 
 	if "Windows" in templates.globals["platforms"]:
@@ -306,6 +308,23 @@ def make_github_flake8(repo_path: pathlib.Path, templates: jinja2.Environment) -
 	return [file.relative_to(repo_path).as_posix()]
 
 
+@management.register("mypy_action")
+def make_github_mypy(repo_path: pathlib.Path, templates: jinja2.Environment) -> List[str]:
+	"""
+	Add configuration for the mypy Github Action.
+
+	:param repo_path: Path to the repository root.
+	:param templates:
+	"""
+
+	file = PathPlus(repo_path / ".github" / "workflows" / "mypy.yml")
+	file.parent.maybe_make(parents=True)
+
+	file.write_clean(templates.get_template(file.name).render())
+
+	return [file.relative_to(repo_path).as_posix()]
+
+
 @management.register("bumpversion")
 def ensure_bumpversion(repo_path: pathlib.Path, templates: jinja2.Environment) -> List[str]:
 	"""

repo_helper/templates/github_ci.yml

@@ -9,15 +9,16 @@ on:
 
 jobs:
   tests:
-    name: "Python ${{ "{{" }} matrix.python-version {{ "}}" }}"
+    name: "Python ${{ brace('matrix.config.python-version')}}"
     runs-on: "{{ ci_platform }}"
     env:
       USING_COVERAGE: '{{ ",".join(no_dev_versions(python_versions)) }}'
 
     strategy:
       fail-fast: False
       matrix:
-        python-version: ["{{ '","'.join(no_dev_versions(python_versions)) }}"]
+        config:{% for version in no_dev_versions(python_versions) %}
+          - {python-version: "{{ version }}", testenvs: "{{ gh_actions_versions[version].replace(' ', '') }}"}{% endfor %}
 
     steps:
       - name: Checkout 🛎️
@@ -26,20 +27,20 @@ jobs:
       - name: Setup Python 🐍
         uses: "actions/setup-python@v2"
         with:
-          python-version: "${{ "{{" }} matrix.python-version {{ "}}" }}"
+          python-version: "${{ brace('matrix.config.python-version')}}"
 
       - name: Install dependencies 🔧
         run: |
           {% for line in dependency_lines %}{{ line }}
           {% endfor %}
-      - name: "Run Tests for Python ${{ "{{" }} matrix.python-version {{ "}}" }}"
-        run: "python -m tox"
+      - name: "Run Tests for Python ${{ brace('matrix.config.python-version')}}"
+        run: "python -m tox -e ${{ brace('matrix.config.testenvs') }}"
 {% if ci_name == "Linux Tests" %}
 {% if enable_tests and not stubs_package %}
       - name: "Upload Coverage"
         uses: actions/upload-artifact@v2
         with:
-          name: "coverage-${{ "{{" }} matrix.python-version {{ "}}" }}"
+          name: "coverage-${{ brace('matrix.config.python-version')}}"
           path: .coverage
 
 
@@ -153,3 +154,5 @@ jobs:
           ANACONDA_TOKEN: ${{ "{{" }} secrets.ANACONDA_TOKEN {{ "}}" }}{% endif %}
 
 {% endif %}
+
+{# TODO: perhaps merge mypy into this workflow,  so that releases depend on it? #}

repo_helper/templates/mypy.yml

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

repo_helper/testing/__init__.py

@@ -59,6 +59,7 @@
 from repo_helper.build import Builder, build_sdist, build_wheel
 from repo_helper.files.linting import lint_warn_list
 from repo_helper.templates import template_dir
+from repo_helper.utils import brace
 
 __all__ = [
 		"demo_environment",
@@ -172,6 +173,11 @@ def test(demo_environment):
 					managed_message="This file is managed by 'repo_helper'. Don't edit it directly.",
 					short_desc="a short description",
 					on_pypi=True,
+					brace=brace,
+					gh_actions_versions={
+							"3.6": "py36, mypy",
+							"3.7": "py37, build",
+							},
 					)
 			)
 

repo_helper/utils.py

@@ -449,3 +449,7 @@ def commit_changes(
 				)
 
 		return commit_sha.decode("UTF-8")
+
+
+def brace(string: str) -> str:
+	return f"{{{{ {string} }}}}"

tests/test_configuration_/test_parse_yaml.yml

@@ -51,7 +51,7 @@ extras_require:
   - lxml
 gh_actions_versions:
   '3.6': py36, build
-  '3.7': py37, build, mypy
+  '3.7': py37, build
   '3.8': py38, build
   3.9-dev: py39-dev, build
 html_context: {}
@@ -112,7 +112,7 @@ tox_requirements: []
 tox_testenv_extras: all
 tox_travis_versions:
   '3.6': py36, build
-  '3.7': py37, build, mypy
+  '3.7': py37, build
   '3.8': py38, build
   3.9-dev: py39-dev, build
 tox_unmanaged: []

tests/test_core_/test_via_Repo_class.yml

@@ -12,6 +12,7 @@
 - .github/workflows/docs_test_action.yml
 - .github/workflows/flake8.yml
 - .github/workflows/manylinux_build.yml
+- .github/workflows/mypy.yml
 - .github/workflows/octocheese.yml
 - .github/workflows/python_ci.yml
 - .github/workflows/python_ci_linux.yml

tests/test_core_/test_via_run_repo_helper_backward_stdout.txt

@@ -6,6 +6,7 @@ The following files will be committed:
   .github\workflows\cleanup.yml
   .github\workflows\docs_test_action.yml
   .github\workflows\flake8.yml
+  .github\workflows\mypy.yml
   .github\workflows\octocheese.yml
   .github\workflows\python_ci.yml
   .github\workflows\python_ci_linux.yml