Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update cookiecutter #427

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": "b27c2d5f8126ea1aefae29a6f5ccfdafad96395d",
"context": {
"cookiecutter": {
"full_name": "David Huard",
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 @@ -56,7 +56,7 @@ jobs:
github.com:443
pypi.org:443
- name: Checkout Repository (no persist-credentials)
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cache-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
objects.githubusercontent.com:443

- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
github.com:443

- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Dependency Review
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
github.com:443
pypi.org:443
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up Python${{ matrix.python-version }}
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
test.opendap.org:80

- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up Python${{ matrix.python-version }}
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
raw.githubusercontent.com:443
test.opendap.org:80
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Patch Environment File
if: matrix.os == 'windows-latest'
run: |
Expand All @@ -171,7 +171,6 @@ jobs:
environment-file: environment-dev.yml
create-args: >-
python=${{ matrix.python-version }}
micromamba-version: "1.5.10-0" # pinned to avoid breaking changes with mamba and micromamba (2.0.0).
- name: Install RavenPy
run: |
python -m pip install -e ".[dev,gis]"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
ruf-repo-cdn.sigstore.dev:443
upload.pypi.org:443
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up Python3
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
www.bestpractices.dev:443

- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Create Release
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # 2.1.0
env:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
ruf-repo-cdn.sigstore.dev:443
test.pypi.org:443
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up Python3
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.1
rev: v0.8.2
hooks:
- id: ruff
args: [ '--fix' ]
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog
=========

v0.17.0 (unreleased)
--------------------

* Updated the cookiecutter template to the latest commit and synchronized dependencies between PyPI and Anaconda recipes. (PR #427).

v0.16.1 (2024-12-05)
--------------------

Expand Down
2 changes: 1 addition & 1 deletion 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
14 changes: 6 additions & 8 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ dependencies:
- geopandas >=1.0
- h5netcdf >=1.3.0
- haversine >=2.8.0
- isort >=5.13.2
- lxml
- matplotlib-base >=3.6.0
- mypy
- netcdf4 <=1.6.5
- numpy >=1.23.0,<2.0
- owslib >=0.29.1
Expand All @@ -36,15 +33,15 @@ dependencies:
- scipy >=1.10.0
- shapely >=2.0.0
- spotpy >=1.6.1
- statsmodels
- statsmodels >=0.14.2
- typing_extensions
- xarray >=2023.11.0
- xclim >=0.50.0
- xesmf
- xskillscore
# Dev tools and testing
- pip >=24.2.0
- black ==24.8.0
- pip >=24.3.1
- black ==24.10.0
- blackdoc ==0.3.9
- bump-my-version >=0.28.1
- click >=8.1.7
Expand All @@ -57,12 +54,13 @@ dependencies:
- holoviews
- hvplot
- isort ==5.13.2
- mypy
- numpydoc >=1.8.0
- pre-commit >=3.5.0
- pytest >=8.2.2
- pytest-cov >=5.0.0
- pytest-xdist >=3.2.0
- ruff >=0.7.0
- ruff >=0.8.2
- setuptools >=71.0
- tox >=4.17.1
- tox >=4.23.2
- watchdog >=4.0.0
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ classifiers = [
]
dynamic = ["description", "version"]
dependencies = [
"cftime",
"cftime >=1.4.1",
# cf-xarray is differently named on conda-forge
"cf-xarray >=0.9.3",
"click >=8.0.0",
Expand Down Expand Up @@ -66,7 +66,7 @@ dependencies = [
[project.optional-dependencies]
dev = [
# Dev tools and testing
"black ==24.8.0",
"black ==24.10.0",
"blackdoc ==0.3.9",
"bump-my-version >=0.28.1",
"coverage >=7.5.0",
Expand All @@ -87,8 +87,8 @@ dev = [
"pytest >=8.3.2",
"pytest-cov >=5.0.0",
"pytest-xdist >=3.2.0",
"ruff >=0.7.0",
"tox >=4.18.0",
"ruff >=0.8.2",
"tox >=4.23.2",
"watchdog >=4.0.0"
]
docs = [
Expand Down Expand Up @@ -263,7 +263,7 @@ disallow_any_generics = true
files = "."
follow_imports = "silent"
no_implicit_reexport = false
python_version = 3.8
python_version = 3.10
show_error_codes = true
warn_no_return = true
warn_redundant_casts = true
Expand Down
9 changes: 5 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{3.10,3.11,3.12,3.13}
docs
requires =
flit >= 3.9.0,<4.0
pip >= 24.2.0
pip >= 24.3.1
setuptools >= 71.0
opts =
--verbose
Expand All @@ -21,12 +21,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.8.2
numpydoc >=1.8.0
commands =
make lint
Expand All @@ -37,6 +37,7 @@ allowlist_externals =
extras =
docs
commands =
make autodoc
make --directory=docs clean html
allowlist_externals =
make
Expand Down
Loading