Skip to content

Commit

Permalink
skip empty py versions
Browse files Browse the repository at this point in the history
  • Loading branch information
sentrivana committed Dec 5, 2023
1 parent 7262deb commit bece639
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-integrations-cloud-computing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.9","3.10","3.11","3.12"]
python-version: ["3.7","3.10","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.9","3.10","3.11","3.12"]
python-version: ["3.6","3.7","3.9","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-data-processing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
python-version: ["3.5","3.7","3.8","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-databases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
python-version: ["3.7","3.8","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7","3.8","3.11","3.12"]
python-version: ["3.7","3.8","3.11"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-miscellaneous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.5","3.6","3.7","3.8","3.9","3.11","3.12"]
python-version: ["3.5","3.8","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-networking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
python-version: ["3.8","3.9","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-web-frameworks-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
python-version: ["3.8","3.10","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-web-frameworks-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.5","3.6","3.7","3.8","3.9","3.11","3.12"]
python-version: ["3.5","3.6","3.7","3.8","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
16 changes: 9 additions & 7 deletions scripts/split-tox-gh-actions/split-tox-gh-actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
template = ENV.get_template("base.jinja")

categories = set()
matrix_py_versions = set()
matrix_py_versions = defaultdict(set)
for framework in frameworks:
if py_versions_pinned[framework]:
categories.add("pinned")
Expand All @@ -261,10 +261,11 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
if "2.7" in py_versions_pinned[framework]:
categories.add("py27")

matrix_py_versions |= set(py_versions_pinned[framework])
matrix_py_versions |= set(py_versions_latest[framework])
matrix_py_versions["pinned"] |= set(py_versions_pinned[framework])
matrix_py_versions["latest"] |= set(py_versions_latest[framework])

matrix_py_versions.discard("2.7")
matrix_py_versions["pinned"].discard("2.7")
matrix_py_versions["latest"].discard("2.7")

context = {
"group": group,
Expand All @@ -276,9 +277,10 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
"needs_github_secrets": bool(
set(frameworks) & FRAMEWORKS_NEEDING_GITHUB_SECRETS
),
"all_versions": [
f'"{version}"' for version in _normalize_py_versions(matrix_py_versions)
],
"versions": {
category: [f'"{version}"' for version in _normalize_py_versions(versions)]
for category, versions in matrix_py_versions.items()
},
}
rendered = template.render(context)
rendered = postprocess_template(rendered)
Expand Down
2 changes: 1 addition & 1 deletion scripts/split-tox-gh-actions/templates/test_group.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
strategy:
fail-fast: false
matrix:
python-version: [{{ all_versions|join(",") }}]
python-version: [{{ versions.get(category)|join(",") }}]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down

0 comments on commit bece639

Please sign in to comment.