diff --git a/.cruft.json b/.cruft.json index 90752f99..3ec80d21 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/Ouranosinc/cookiecutter-pypackage", - "commit": "1d9ee5f08d3e8e4f78a4aabb75e2ce4eff8750bf", + "commit": "b27c2d5f8126ea1aefae29a6f5ccfdafad96395d", "context": { "cookiecutter": { "full_name": "David Huard", diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 94199b49..aa5821c3 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -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 diff --git a/.github/workflows/cache-cleaner.yml b/.github/workflows/cache-cleaner.yml index 825fa33f..73cc92ab 100644 --- a/.github/workflows/cache-cleaner.yml +++ b/.github/workflows/cache-cleaner.yml @@ -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: | diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index c630661c..f4ade8b8 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d37647bf..53c5a24d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: @@ -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 @@ -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: | @@ -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]" diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 12e7039c..72d3efc5 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -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: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 51b273f6..3e6948a0 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -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 diff --git a/.github/workflows/tag-testpypi.yml b/.github/workflows/tag-testpypi.yml index add4e399..d86bc79a 100644 --- a/.github/workflows/tag-testpypi.yml +++ b/.github/workflows/tag-testpypi.yml @@ -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: @@ -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: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 246ba605..9e6f7405 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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' ] diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b4d109c7..466705af 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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) -------------------- diff --git a/CI/requirements_ci.txt b/CI/requirements_ci.txt index 611dee27..de3b3861 100644 --- a/CI/requirements_ci.txt +++ b/CI/requirements_ci.txt @@ -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 diff --git a/environment-dev.yml b/environment-dev.yml index f32ac71f..63d1b426 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -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 @@ -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 @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 988983ae..3f79e053 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", @@ -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", @@ -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 = [ @@ -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 diff --git a/tox.ini b/tox.ini index ff9d480b..59659673 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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 @@ -37,6 +37,7 @@ allowlist_externals = extras = docs commands = + make autodoc make --directory=docs clean html allowlist_externals = make