Skip to content

Commit

Permalink
Merge branch 'master' into drop-python38
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeitsperre authored Jan 22, 2024
2 parents ee43930 + ccf574c commit 6e7c832
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: 'Dependency Review'
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507
uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976
9 changes: 6 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ jobs:
- tox-env: py311-coverage-sbck
python-version: "3.11"
markers: -m 'not slow'
- tox-env: py312-coverage-numba
python-version: "3.12"
markers: -m 'not slow'
- tox-env: notebooks_doctests
python-version: "3.10"
- tox-env: offline-prefetch
Expand Down Expand Up @@ -169,7 +172,7 @@ jobs:

test-conda:
needs: lint
name: test-conda-${{ matrix.tox-env }} (Python${{ matrix.python-version }})
name: test-conda-Python${{ matrix.python-version }}
if: |
contains(github.event.pull_request.labels.*.name, 'approved') ||
(github.event.review.state == 'approved') ||
Expand All @@ -178,8 +181,8 @@ jobs:
strategy:
matrix:
include:
- tox-env: py311
python-version: "3.11"
- python-version: "3.9"
- python-version: "3.12"
defaults:
run:
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595
uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
with:
name: SARIF file
path: results.sarif
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal B
Announcements
^^^^^^^^^^^^^
* `xclim` no longer supports Python3.8. (:issue:`1268`, :pull:`1565`).
* `xclim` now officially supports Python3.12 (requires `numba>=0.59.0`). (:pull:`1613`).
* `xclim` now adheres to the `Semantic Versioning 2.0.0 <https://semver.org/>`_ specification. (:issue:`1556`, :pull:`1569`).
* The `xclim` repository now uses `GitHub Discussions <https://github.com/Ouranosinc/xclim/discussions>`_ to offer help for users, coordinate translation efforts, and support general Q&A for the `xclim` community. The `xclim` `Gitter` room has been deprecated in favour of GitHub Discussions. (:issue:`1571`, :pull:`1572`).

Expand Down
148 changes: 75 additions & 73 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,77 +1,79 @@
name: xclim
channels:
- conda-forge
- defaults
- numba # Added to gain access to Python3.12-compatible numba release candidates.
- conda-forge
- defaults
dependencies:
- python >=3.9,<3.12
- astroid
- boltons >=20.1
- bottleneck >=1.3.1
- cf_xarray >=0.6.1
- cftime >=1.4.1
- Click >=8.1
- dask >=2.6.0
- jsonpickle
- lmoments3
- numba
- numpy >=1.20.0
- pandas >=2.2
- pint >=0.9
- poppler >=0.67
- pyyaml
- scikit-learn >=0.21.3
- scipy >=1.10.0
- statsmodels
- xarray >=2023.11.0
- yamale
# Extras
- eofs
- flox
- python >=3.9
- astroid
- boltons >=20.1
- bottleneck >=1.3.1
- cf_xarray >=0.6.1
- cftime >=1.4.1
- Click >=8.1
- dask >=2.6.0
- importlib-resources # For Python3.8
- jsonpickle
- lmoments3
- numba
- numpy >=1.20.0
- pandas >=2.2.0
- pint >=0.9
- poppler >=0.67
- pyyaml
- scikit-learn >=0.21.3
- scipy >=1.10.0
- statsmodels
- xarray >=2023.11.0
- yamale
# Extras
- eofs
- flox
# Testing and development dependencies
- black >=22.12
- blackdoc
- bump-my-version
- cairosvg
- codespell
- coverage
- distributed >=2.0
- filelock
- flake8
- flake8-rst-docstrings
- flit
- h5netcdf
- ipykernel
- ipython
- matplotlib
- mypy
- nbqa
- nbsphinx
- nbval
- nc-time-axis
- netCDF4 >=1.4
- notebook
- platformdirs
- pooch
- pre-commit
- pybtex
- pylint
- pytest
- pytest-cov
- pytest-socket
- pytest-xdist >=3.2
- ruff >=0.1.0
- sphinx
- sphinx-autodoc-typehints
- sphinx-codeautolink
- sphinx-copybutton
- sphinx-rtd-theme >=1.0
- sphinxcontrib-bibtex
- tokenize-rt
- tox
# - tox-conda # Will be added when a [email protected]+ compatible plugin is released.
- xdoctest
- yamllint
- pip
- pip:
- flake8-alphabetize
- sphinxcontrib-svg2pdfconverter
- black >=22.12
- blackdoc
- bump-my-version
- cairosvg
- codespell
- coverage
- distributed >=2.0
- filelock
- flake8
- flake8-rst-docstrings
- flit
- h5netcdf
- ipykernel
- ipython
- matplotlib
- mypy
- nbqa
- nbsphinx
- nbval
- nc-time-axis
- netCDF4 >=1.4
- notebook
- platformdirs
- pooch
- pre-commit
- pybtex
- pylint
- pytest
- pytest-cov
- pytest-socket
- pytest-xdist >=3.2
- ruff >=0.1.0
- sphinx
- sphinx-autodoc-typehints
- sphinx-codeautolink
- sphinx-copybutton
- sphinx-rtd-theme >=1.0
- sphinxcontrib-bibtex
- tokenize-rt
- tox
# - tox-conda # Will be added when a [email protected]+ compatible plugin is released.
- xdoctest
- yamllint
- pip
- pip:
- flake8-alphabetize
- sphinxcontrib-svg2pdfconverter
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
# "Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Atmospheric Science"
]
dynamic = ["description", "version"]
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env_list =
py39-upstream-doctest
py310
py311
; py312
py312-numba
labels =
test = py39, py310-upstream-doctest, py311, notebooks_doctests, offline-prefetch
requires =
Expand Down Expand Up @@ -104,6 +104,9 @@ passenv =
XCLIM_*
extras = dev
deps =
# FIXME: Remove when numba 0.59.0 is released
numba: numba==0.59.0rc1
numba: llvmlite==0.42.0rc1
coverage: coveralls
upstream: -rrequirements_upstream.txt
eofs: eofs
Expand Down

0 comments on commit 6e7c832

Please sign in to comment.