Skip to content

Commit

Permalink
Merge pull request #124 from ecmwf-projects/template-update
Browse files Browse the repository at this point in the history
Template update and pin mypy
  • Loading branch information
alex75 authored Aug 2, 2024
2 parents 798c741 + 42d2f2a commit 1b9931c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
"commit": "104191f7bf58670f65db81e04b34e7bf56bb4985",
"commit": "5c8a3dfc59e893134050fe4e355893dd1d08b2e7",
"checkout": null,
"context": {
"cookiecutter": {
Expand All @@ -11,6 +11,7 @@
"copyright_year": "2022",
"mypy_strict": "True",
"integration_tests": "False",
"pypi": "false",
"_template": "https://github.com/ecmwf-projects/cookiecutter-conda-package"
}
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:
runs-on: ubuntu-latest
needs: distribution
if: |
always() &&
always() && false &&
needs.distribution.result == 'success' &&
github.event_name == 'push' &&
startsWith(github.ref, 'refs/tags')
Expand All @@ -230,6 +230,6 @@ jobs:
with:
name: distribution
path: dist
- uses: pypa/gh-action-pypi-publish@v1.8.14
- uses: pypa/gh-action-pypi-publish@v1.9.0
with:
verbose: true
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
- id: blackdoc
additional_dependencies: [black==23.11.0]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.5
rev: v0.5.5
hooks:
- id: ruff
args: [--fix, --show-fixes]
Expand All @@ -28,13 +28,13 @@ repos:
hooks:
- id: mdformat
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.13.0
rev: v2.14.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --preserve-quotes]
- id: pretty-format-toml
args: [--autofix]
- repo: https://github.com/gitleaks/gitleaks
rev: v8.18.2
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 2 additions & 0 deletions ci/environment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ dependencies:
- sphinx
- sphinx-autoapi
# DO NOT EDIT ABOVE THIS LINE, ADD DEPENDENCIES BELOW
- mypy != 1.11.0
- mypy != 1.11.1
- pip
- postgresql
- psycopg
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[build-system]
requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"
requires = ["setuptools>=64", "setuptools_scm>=8"]

[project]
classifiers = [
Expand Down

0 comments on commit 1b9931c

Please sign in to comment.