Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into replace-prettier-hook
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdewar committed Aug 5, 2024
2 parents 8fd34fb + 64461a6 commit 05de241
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
4 changes: 4 additions & 0 deletions cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,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",
Expand All @@ -20,6 +22,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"
}
}
8 changes: 7 additions & 1 deletion {{ cookiecutter.project_slug }}/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions {{ cookiecutter.project_slug }}/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -62,11 +62,11 @@ 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
typing-extensions==4.12.2
# via mypy
virtualenv==20.26.1
virtualenv==20.26.3
# via pre-commit
wheel==0.43.0
# via pip-tools
Expand Down

0 comments on commit 05de241

Please sign in to comment.