From 3da4400ba25b947d5def7d950b357fbbab3b6f38 Mon Sep 17 00:00:00 2001 From: Alex Dewar Date: Mon, 29 Jul 2024 18:06:35 +0100 Subject: [PATCH 1/6] Allow users to opt into/out of different CI runners Closes #24. --- cookiecutter.json | 4 ++++ {{ cookiecutter.project_slug }}/.github/workflows/ci.yml | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cookiecutter.json b/cookiecutter.json index 323424a..23d00fd 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -8,6 +8,8 @@ "use_bsd3_licence": false, "add_precommit_workflows": true, "automerge_bot_prs": false, + "use_windows_ci_runner": false, + "use_macos_ci_runner": false, "__prompts__": { "project_name": "Enter a human-readable name for the project", "project_slug": "Enter a name for the Python package", @@ -17,6 +19,8 @@ "packaging": "Select the Python packaging tool you wish to use", "use_bsd3_licence": "Whether to use Imperial's default open-source licence (BSD 3-clause)", "add_precommit_workflows": "Add Github Actions to run pre-commit hooks (only needed for private repositories)", + "use_windows_ci_runner": "Add a GitHub Actions runner for Windows (needed if your software targets Windows)", + "use_macos_ci_runner": "Add a GitHub Actions runner for macOS (needed if your software targets macOS - ARM)", "automerge_bot_prs": "Whether to automatically merge PRs from bots including dependabot" } } diff --git a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml index 41a45fc..87f5468 100644 --- a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml +++ b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml @@ -12,7 +12,13 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: + - ubuntu-latest +{%- if cookiecutter.use_windows_ci_runner %} + - windows-latest +{%- endif %} +{%- if cookiecutter.use_macos_ci_runner %} + - macos-latest{% endif %} python-version: ["3.12"] steps: From 18812f5d5a145b97092b916c9f7e13334454c3a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:34:11 +0000 Subject: [PATCH 2/6] Bump packaging from 24.0 to 24.1 Bumps [packaging](https://github.com/pypa/packaging) from 24.0 to 24.1. - [Release notes](https://github.com/pypa/packaging/releases) - [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pypa/packaging/compare/24.0...24.1) --- updated-dependencies: - dependency-name: packaging dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- {{ cookiecutter.project_slug }}/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{ cookiecutter.project_slug }}/dev-requirements.txt b/{{ cookiecutter.project_slug }}/dev-requirements.txt index eefb1cc..d49b914 100644 --- a/{{ cookiecutter.project_slug }}/dev-requirements.txt +++ b/{{ cookiecutter.project_slug }}/dev-requirements.txt @@ -32,7 +32,7 @@ mypy-extensions==1.0.0 # via mypy nodeenv==1.9.1 # via pre-commit -packaging==24.0 +packaging==24.1 # via # build # pytest From 648747c2995aa7505cb610a1f475fe24e298dd3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:34:17 +0000 Subject: [PATCH 3/6] Bump filelock from 3.13.1 to 3.15.4 Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.13.1 to 3.15.4. - [Release notes](https://github.com/tox-dev/py-filelock/releases) - [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/py-filelock/compare/3.13.1...3.15.4) --- updated-dependencies: - dependency-name: filelock dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- {{ cookiecutter.project_slug }}/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{ cookiecutter.project_slug }}/dev-requirements.txt b/{{ cookiecutter.project_slug }}/dev-requirements.txt index eefb1cc..efe5ae2 100644 --- a/{{ cookiecutter.project_slug }}/dev-requirements.txt +++ b/{{ cookiecutter.project_slug }}/dev-requirements.txt @@ -16,7 +16,7 @@ coverage[toml]==7.6.0 # via pytest-cov distlib==0.3.8 # via virtualenv -filelock==3.13.1 +filelock==3.15.4 # via # pytest-mypy # virtualenv From d691bcf3bf83602fa9de6783b460d3a1f1d3ce68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:34:20 +0000 Subject: [PATCH 4/6] Bump virtualenv from 20.26.1 to 20.26.3 Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.26.1 to 20.26.3. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/virtualenv/compare/20.26.1...20.26.3) --- updated-dependencies: - dependency-name: virtualenv dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{ cookiecutter.project_slug }}/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{ cookiecutter.project_slug }}/dev-requirements.txt b/{{ cookiecutter.project_slug }}/dev-requirements.txt index eefb1cc..fd8dbd3 100644 --- a/{{ cookiecutter.project_slug }}/dev-requirements.txt +++ b/{{ cookiecutter.project_slug }}/dev-requirements.txt @@ -66,7 +66,7 @@ ruff==0.5.4 # via datahub (pyproject.toml) typing-extensions==4.9.0 # via mypy -virtualenv==20.26.1 +virtualenv==20.26.3 # via pre-commit wheel==0.43.0 # via pip-tools From 8684dddad4c4d8b111fddc5b0c9bedda40584487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:34:27 +0000 Subject: [PATCH 5/6] Bump ruff from 0.5.4 to 0.5.6 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.5.4 to 0.5.6. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.5.4...0.5.6) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{ cookiecutter.project_slug }}/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{ cookiecutter.project_slug }}/dev-requirements.txt b/{{ cookiecutter.project_slug }}/dev-requirements.txt index eefb1cc..23af610 100644 --- a/{{ cookiecutter.project_slug }}/dev-requirements.txt +++ b/{{ cookiecutter.project_slug }}/dev-requirements.txt @@ -62,7 +62,7 @@ pytest-mypy==0.10.3 # via datahub (pyproject.toml) pyyaml==6.0.1 # via pre-commit -ruff==0.5.4 +ruff==0.5.6 # via datahub (pyproject.toml) typing-extensions==4.9.0 # via mypy From e046ab6018b78e977ebe932c2c5d32124e7e8cc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:43:57 +0000 Subject: [PATCH 6/6] Bump typing-extensions from 4.9.0 to 4.12.2 Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.9.0 to 4.12.2. - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.9.0...4.12.2) --- updated-dependencies: - dependency-name: typing-extensions dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- {{ cookiecutter.project_slug }}/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{ cookiecutter.project_slug }}/dev-requirements.txt b/{{ cookiecutter.project_slug }}/dev-requirements.txt index 0a9debd..a845e23 100644 --- a/{{ cookiecutter.project_slug }}/dev-requirements.txt +++ b/{{ cookiecutter.project_slug }}/dev-requirements.txt @@ -64,7 +64,7 @@ pyyaml==6.0.1 # via pre-commit ruff==0.5.6 # via datahub (pyproject.toml) -typing-extensions==4.9.0 +typing-extensions==4.12.2 # via mypy virtualenv==20.26.3 # via pre-commit