Skip Python 3.6 in GitHub Actions for Linux now Ubuntu 22.04 is used.

domdfcoding · domdfcoding · commit e257abe65dcd · 2025-05-02T15:40:45.000+01:00
diff --git a/repo_helper/files/ci_cd.py b/repo_helper/files/ci_cd.py
@@ -301,6 +301,12 @@ def make_linux(self) -> PathPlus:
 
 		if platform_name in self.templates.globals["platforms"]:
 
+			gh_actions_versions = self.get_gh_actions_matrix()
+			if "pypy-3.6" in gh_actions_versions:
+				gh_actions_versions.pop("pypy-3.6")
+			if "3.6" in gh_actions_versions:
+				gh_actions_versions.pop("3.6")
+
 			conda_pip_dependencies = ["mkrecipe"]
 
 			pyproject_file = PathPlus(self.repo_path / "pyproject.toml")
@@ -315,7 +321,7 @@ def make_linux(self) -> PathPlus:
 							ci_platform=platform_ci_names[platform_name],
 							ci_name=platform_name,
 							dependency_lines=self.get_linux_ci_requirements(),
-							gh_actions_versions=self.get_gh_actions_matrix(),
+							gh_actions_versions=gh_actions_versions,
 							code_file_filter=self._code_file_filter,
 							run_on_tags="    tags:\n      - '*'",
 							conda_pip_dependencies=conda_pip_dependencies,
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_1.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_1.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_2.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_2.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_no_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_no_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_no_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_no_tests_no_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_no_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_no_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_no_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_no_releases_tests_no_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_no_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_no_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_no_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_no_tests_no_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_no_conda_no_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_no_conda_no_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_no_conda_pure_python_.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_3_releases_tests_no_conda_pure_python_.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
 
     steps:
diff --git a/tests/test_files/test_ci_cd_/test_make_github_linux_case_4.yml b/tests/test_files/test_ci_cd_/test_make_github_linux_case_4.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: False
       matrix:
         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}
