Skip to content

Commit

Permalink
fast-forward cookiecutter
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeitsperre committed Nov 4, 2024
1 parent 52628da commit 11731fc
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
"commit": "1d9ee5f08d3e8e4f78a4aabb75e2ce4eff8750bf",
"commit": "f750ad2185cbb56df6f7e98a269bdd8399283ea8",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
actions: read
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
disable-sudo: true
egress-policy: block
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- "3.10"
- "3.11"
- "3.12"
# - "3.13.0-rc.2"
# - "3.13"
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
files.pythonhosted.org:443
github.com:443
pypi.org:443
ruf-repo-cdn.sigstore.dev:443
upload.pypi.org:443
- name: Checkout Repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tag-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
files.pythonhosted.org:443
github.com:443
pypi.org:443
ruf-repo-cdn.sigstore.dev:443
test.pypi.org:443
- name: Checkout Repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
4 changes: 2 additions & 2 deletions CI/requirements_ci.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bump-my-version==0.28.0
coveralls==4.0.1
pip==24.3.1
flit==3.10.1
flit==3.9.0
tox==4.23.2
tox-gh==1.4.1
tox-gh==1.4.4
16 changes: 7 additions & 9 deletions CI/requirements_ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --generate-hashes --output-file=CI/requirements_ci.txt CI/requirements_ci.in
Expand Down Expand Up @@ -399,27 +399,25 @@ tox==4.23.2 \
# via
# -r CI/requirements_ci.in
# tox-gh
tox-gh==1.4.1 \
--hash=sha256:005b33d16eef1bd1dae9f7d8b3cef53374af7d475f9c9c33ef098247741fb694 \
--hash=sha256:da422beccbdc5ad5994fe8faf6c193f2d794e957628b052ba23e7fcf9e2e340f
tox-gh==1.4.4 \
--hash=sha256:4ea585f66585b90f5826b1677cfc9453747792a0f9ff83d468603bc17556e07b \
--hash=sha256:b962e0f8c4619e98d11c2a135939876691e148b843b7dac4cff7de1dc4f7c215
# via -r CI/requirements_ci.in
typing-extensions==4.12.2 \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
--hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
# via
# annotated-types
# pydantic
# pydantic-core
# rich
# rich-click
# tox
urllib3==2.2.2 \
--hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
--hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
# via requests
virtualenv==20.26.6 \
--hash=sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48 \
--hash=sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2
virtualenv==20.27.1 \
--hash=sha256:142c6be10212543b32c6c45d3d3893dff89112cc588b7d0879ae5a1ec03a47ba \
--hash=sha256:f11f1b8a29525562925f745563bfd48b189450f61fb34c4f9cc79dd5aa32a1f4
# via tox
wcmatch==8.5.2 \
--hash=sha256:17d3ad3758f9d0b5b4dedc770b65420d4dac62e680229c287bf24c9db856a478 \
Expand Down
10 changes: 5 additions & 5 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ dependencies:
- yamale
# Dev tools and testing
- netcdf4
- pip >=24.2.0
- bump-my-version >=0.25.1
- pip >=24.3.1
- bump-my-version >=0.28.0
- watchdog >=4.0.0
- flake8 >=7.1.1
- flake8-rst-docstrings >=0.3.0
- flit >=3.9.0,<4.0
- tox >=4.17.1
- tox >=4.23.2
- coverage >=7.5.0
- coveralls >=4.0.1
- typer >=0.12.3
- pytest <8.0.0
- pytest-cov >=5.0.0
- pytest-xdist >=3.2.0
- black ==24.8.0
- black ==24.10.0
- blackdoc ==0.3.9
- isort ==5.13.2
- numpydoc >=1.8.0
- pooch >=1.8.0
- pre-commit >=3.5.0
- ruff >=0.5.7
- ruff >=0.7.0
- xdoctest>=1.1.5
13 changes: 6 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ dependencies = [
[project.optional-dependencies]
dev = [
# Dev tools and testing
"pip >=24.2.0",
"bump-my-version >=0.26.0",
"pip >=24.3.1",
"bump-my-version >=0.28.0",
"watchdog >=4.0.0",
"flake8 >=7.1.1",
"flake8-rst-docstrings >=0.3.0",
"flit >=3.9.0,<4.0",
"tox >=4.18.0",
"tox >=4.23.2",
"coverage >=7.5.0",
"coveralls >=4.0.1",
"mypy",
Expand All @@ -68,14 +68,14 @@ dev = [
"pytest <8.0.0",
"pytest-cov >=5.0.0",
"pytest-xdist >=3.2.0",
"black ==24.8.0",
"black ==24.10.0",
"blackdoc ==0.3.9",
"isort ==5.13.2",
"ruff >=0.5.7",
"ruff >=0.7.0",
"pooch >=1.8.0",
"pre-commit >=3.5.0",
"xdoctest>=1.1.5",
"xclim >= 0.53"
"xclim >= 0.53.2"
]
docs = [
# Documentation and examples
Expand All @@ -86,7 +86,6 @@ docs = [
"sphinx-intl",
"sphinx-rtd-theme >=1.0",
"nbsphinx",
"pandoc",
"ipython",
"ipykernel",
"jupyter_client",
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
min_version = 4.18.0
min_version = 4.23.2
envlist =
lint
py{310,311,312,313}
docs
requires =
flit >= 3.9.0,<4.0
pip >= 24.2.0
pip >= 24.3.1
opts =
--verbose

Expand All @@ -20,12 +20,12 @@ python =
[testenv:lint]
skip_install = True
deps =
black ==24.8.0
black ==24.10.0
blackdoc ==0.3.9
isort ==5.13.2
flake8 >=7.1.1
flake8-rst-docstrings >=0.3.0
ruff >=0.5.7
ruff >=0.7.0
numpydoc >=1.8.0
commands =
make lint
Expand Down

0 comments on commit 11731fc

Please sign in to comment.