diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 536ec5cd6..cdb632c05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -407,14 +407,12 @@ jobs: continue-on-error: true - name: Test with pytest run: | - python -m pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=term-missing - - name: Report coverage - run: | - coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: run-{{ matrix.python-version }}-conda - COVERALLS_PARALLEL: true + python -m pytest --numprocesses=logical --durations=10 --cov=xclim --cov-report=lcov + - name: Report Coverage + uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6 + with: + flag-name: run-{{ matrix.python-version }}-conda + parallel: true - name: Tests measurement uses: green-coding-solutions/eco-ci-energy-estimation@7ff5628108e21227662ce881f10156eb9deab891 # v4.4 with: diff --git a/.gitignore b/.gitignore index a92c3a916..d1d6d1966 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ htmlcov/ .coverage.* .cache nosetests.xml +coverage.lcov coverage.xml *.cover .hypothesis/ diff --git a/.readthedocs.yml b/.readthedocs.yml index 1f9c01886..1088e05d5 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,10 +8,12 @@ sphinx: # - pdf build: - os: ubuntu-22.04 + os: ubuntu-24.04 tools: - python: "mambaforge-22.9" + python: "mambaforge-23.11" jobs: + pre_create_environment: + - sed -i "s/python >=3.11,<3.14/python >=3.11,<3.13/" environment.yml pre_build: - sphinx-apidoc -o docs/apidoc/ --private --module-first src/xclim src/xclim/testing/tests src/xclim/indicators src/xclim/indices - rm docs/apidoc/xclim.rst @@ -31,7 +33,6 @@ python: search: ranking: - notebooks/*: 2 api_indicators.html: 1 indices.html: -1 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9051f3b51..10b1543e5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,19 @@ Changelog ========= +v0.56.0 (unreleased) +-------------------- +Contributors to this version: Trevor James Smith (:user:`Zeitsperre`). + +Breaking changes +^^^^^^^^^^^^^^^^ +* `xclim` no longer supports Python 3.10. The minimum required version is now Python 3.11. (:pull:`2082`). +* The minimum versions of several key dependencies have been raised (`numpy` >=1.24.0; `scikit-learn` >=1.2.0; `scipy` >=1.11.0). (:pull:`2082`). + +Internal changes +^^^^^^^^^^^^^^^^ +* `black`, `isort`, and `nbqa` have all been dropped from the development dependencies. (:issue:`1805`, :pull:`2082`). + v0.55.0 (2025-02-17) -------------------- Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Trevor James Smith (:user:`Zeitsperre`), Sascha Hofmann (:user:`saschahofmann`), Pascal Bourgault (:user:`aulemahal`), Éric Dupuis (:user:`coxipi`), Baptiste Hamon (:user:`baptistehamon`), Sarah Gammon (:user:`SarahG-579462`). diff --git a/docs/references.rst b/docs/references.rst index 31f02b0c3..22ba91d32 100644 --- a/docs/references.rst +++ b/docs/references.rst @@ -1,4 +1,4 @@ -.. only:: html +.. only:: not latex ============ Bibliography diff --git a/environment.yml b/environment.yml index a980170c0..28e3b4aeb 100644 --- a/environment.yml +++ b/environment.yml @@ -34,8 +34,7 @@ dependencies: - cairosvg >=2.6.0 - codespell >=2.4.1 - coverage >=7.5.0 - - coveralls >=4.0.1 # Note: coveralls is not yet compatible with Python 3.13 - - deptry =0.23.0 + - deptry >=0.23.0 - distributed >=2.0 - flake8 >=7.1.1 - flake8-rst-docstrings >=0.3.0 @@ -64,7 +63,7 @@ dependencies: - pytest-socket >=0.6.0 - pytest-xdist >=3.2 - ruff >=0.9.6 - - sphinx >=7.0.0 + - sphinx >=7.1.0,<8.2 - sphinx-autobuild >=2024.4.16 - sphinx-autodoc-typehints - sphinx-codeautolink >=0.16.2 diff --git a/pyproject.toml b/pyproject.toml index 342d63703..0f32b9cb0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ dev = [ "bump-my-version >=0.32.1", "codespell >=2.4.1", "coverage[toml] >=7.5.0", - "deptry ==0.23.0", + "deptry >=0.23.0", "flake8 >=7.1.1", "flake8-rst-docstrings ==0.3.0", "h5netcdf>=1.3.0", @@ -100,9 +100,9 @@ docs = [ "nc-time-axis >=1.4.1", "pooch >=1.8.0", "pybtex >=0.24.0", - "sphinx >=7.0.0", + "sphinx >=8.2.0", "sphinx-autobuild >=2024.4.16", - "sphinx-autodoc-typehints", + "sphinx-autodoc-typehints >=3.1.0", "sphinx-codeautolink >=0.16.2", "sphinx-copybutton", "sphinx-mdinclude", @@ -126,13 +126,6 @@ xclim = "xclim.cli:cli" [tool] -[tool.black] -target-version = [ - "py311", - "py312", - "py313" -] - [tool.bumpversion] current_version = "0.55.1-dev.0" commit = true