Skip to content

Commit bb18108

Browse files
authored
Merge pull request #39 from Ouranosinc/fast-forward
fast-forward cookiecutter
2 parents f6e6efd + 18ce70e commit bb18108

File tree

9 files changed

+34
-35
lines changed

9 files changed

+34
-35
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
3-
"commit": "1d9ee5f08d3e8e4f78a4aabb75e2ce4eff8750bf",
3+
"commit": "f750ad2185cbb56df6f7e98a269bdd8399283ea8",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- "3.10"
6060
- "3.11"
6161
- "3.12"
62-
# - "3.13.0-rc.2"
62+
# - "3.13"
6363
steps:
6464
- name: Harden Runner
6565
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -82,7 +82,7 @@ jobs:
8282
key: ${{ matrix.os }}-Python${{ matrix.python-version }}-${{ hashFiles('pyproject.toml', 'tox.ini') }}
8383
- name: Test with tox
8484
run: |
85-
python -m tox
85+
python -m tox -e ${{ matrix.python-version }}-coveralls
8686
env:
8787
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8888
COVERALLS_FLAG_NAME: run-${{ matrix.python-version }}

.github/workflows/publish-pypi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
files.pythonhosted.org:443
2727
github.com:443
2828
pypi.org:443
29+
ruf-repo-cdn.sigstore.dev:443
2930
upload.pypi.org:443
3031
- name: Checkout Repository
3132
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/tag-testpypi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
files.pythonhosted.org:443
5151
github.com:443
5252
pypi.org:443
53+
ruf-repo-cdn.sigstore.dev:443
5354
test.pypi.org:443
5455
- name: Checkout Repository
5556
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

CI/requirements_ci.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bump-my-version==0.28.0
22
coveralls==4.0.1
33
pip==24.3.1
4-
flit==3.10.1
4+
flit==3.9.0
55
tox==4.23.2
6-
tox-gh==1.4.1
6+
tox-gh==1.4.4

CI/requirements_ci.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
55
# pip-compile --generate-hashes --output-file=CI/requirements_ci.txt CI/requirements_ci.in
@@ -399,27 +399,25 @@ tox==4.23.2 \
399399
# via
400400
# -r CI/requirements_ci.in
401401
# tox-gh
402-
tox-gh==1.4.1 \
403-
--hash=sha256:005b33d16eef1bd1dae9f7d8b3cef53374af7d475f9c9c33ef098247741fb694 \
404-
--hash=sha256:da422beccbdc5ad5994fe8faf6c193f2d794e957628b052ba23e7fcf9e2e340f
402+
tox-gh==1.4.4 \
403+
--hash=sha256:4ea585f66585b90f5826b1677cfc9453747792a0f9ff83d468603bc17556e07b \
404+
--hash=sha256:b962e0f8c4619e98d11c2a135939876691e148b843b7dac4cff7de1dc4f7c215
405405
# via -r CI/requirements_ci.in
406406
typing-extensions==4.12.2 \
407407
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
408408
--hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
409409
# via
410-
# annotated-types
411410
# pydantic
412411
# pydantic-core
413-
# rich
414412
# rich-click
415413
# tox
416414
urllib3==2.2.2 \
417415
--hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
418416
--hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
419417
# via requests
420-
virtualenv==20.26.6 \
421-
--hash=sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48 \
422-
--hash=sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2
418+
virtualenv==20.27.1 \
419+
--hash=sha256:142c6be10212543b32c6c45d3d3893dff89112cc588b7d0879ae5a1ec03a47ba \
420+
--hash=sha256:f11f1b8a29525562925f745563bfd48b189450f61fb34c4f9cc79dd5aa32a1f4
423421
# via tox
424422
wcmatch==8.5.2 \
425423
--hash=sha256:17d3ad3758f9d0b5b4dedc770b65420d4dac62e680229c287bf24c9db856a478 \

environment-dev.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ dependencies:
2121
- yamale
2222
# Dev tools and testing
2323
- netcdf4
24-
- pip >=24.2.0
25-
- bump-my-version >=0.25.1
24+
- pip >=24.3.1
25+
- bump-my-version >=0.28.0
2626
- watchdog >=4.0.0
2727
- flake8 >=7.1.1
2828
- flake8-rst-docstrings >=0.3.0
2929
- flit >=3.9.0,<4.0
30-
- tox >=4.17.1
30+
- tox >=4.23.2
3131
- coverage >=7.5.0
3232
- coveralls >=4.0.1
3333
- typer >=0.12.3
3434
- pytest <8.0.0
3535
- pytest-cov >=5.0.0
3636
- pytest-xdist >=3.2.0
37-
- black ==24.8.0
37+
- black ==24.10.0
3838
- blackdoc ==0.3.9
3939
- isort ==5.13.2
4040
- numpydoc >=1.8.0
4141
- pooch >=1.8.0
4242
- pre-commit >=3.5.0
43-
- ruff >=0.5.7
43+
- ruff >=0.7.0
4444
- xdoctest>=1.1.5

pyproject.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ dependencies = [
5353
[project.optional-dependencies]
5454
dev = [
5555
# Dev tools and testing
56-
"pip >=24.2.0",
57-
"bump-my-version >=0.26.0",
56+
"pip >=24.3.1",
57+
"bump-my-version >=0.28.0",
5858
"watchdog >=4.0.0",
5959
"flake8 >=7.1.1",
6060
"flake8-rst-docstrings >=0.3.0",
6161
"flit >=3.9.0,<4.0",
62-
"tox >=4.18.0",
62+
"tox >=4.23.2",
6363
"coverage >=7.5.0",
6464
"coveralls >=4.0.1",
6565
"mypy",
@@ -68,14 +68,14 @@ dev = [
6868
"pytest <8.0.0",
6969
"pytest-cov >=5.0.0",
7070
"pytest-xdist >=3.2.0",
71-
"black ==24.8.0",
71+
"black ==24.10.0",
7272
"blackdoc ==0.3.9",
7373
"isort ==5.13.2",
74-
"ruff >=0.5.7",
74+
"ruff >=0.7.0",
7575
"pooch >=1.8.0",
7676
"pre-commit >=3.5.0",
7777
"xdoctest>=1.1.5",
78-
"xclim >= 0.53"
78+
"xclim >= 0.53.2"
7979
]
8080
docs = [
8181
# Documentation and examples
@@ -86,7 +86,6 @@ docs = [
8686
"sphinx-intl",
8787
"sphinx-rtd-theme >=1.0",
8888
"nbsphinx",
89-
"pandoc",
9089
"ipython",
9190
"ipykernel",
9291
"jupyter_client",

tox.ini

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
[tox]
2-
min_version = 4.18.0
2+
min_version = 4.23.2
33
envlist =
44
lint
5-
py{310,311,312,313}
5+
3.{10,11,12,13}
66
docs
77
requires =
88
flit >= 3.9.0,<4.0
9-
pip >= 24.2.0
9+
pip >= 24.3.1
1010
opts =
1111
--verbose
1212

1313
[gh]
1414
python =
15-
3.10 = py310-coveralls
16-
3.11 = py311-coveralls
17-
3.12 = py312-coveralls
18-
3.13 = py313-coveralls
15+
3.10 = py3.10-coveralls
16+
3.11 = py3.11-coveralls
17+
3.12 = py3.12-coveralls
18+
3.13 = py3.13-coveralls
1919

2020
[testenv:lint]
2121
skip_install = True
2222
deps =
23-
black ==24.8.0
23+
black ==24.10.0
2424
blackdoc ==0.3.9
2525
isort ==5.13.2
2626
flake8 >=7.1.1
2727
flake8-rst-docstrings >=0.3.0
28-
ruff >=0.5.7
28+
ruff >=0.7.0
2929
numpydoc >=1.8.0
3030
commands =
3131
make lint

0 commit comments

Comments
 (0)