diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7d52a70..d0cb3c4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,6 +18,8 @@ jobs: - py310-all - py311-all - py312-all + - py313-all + - py314-all use-mpl: - "--mpl --mpl-results-path=/tmp/salem-mpl-results" include: @@ -31,7 +33,7 @@ jobs: shell: bash -leo pipefail {0} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Conda uses: conda-incubator/setup-miniconda@v3 with: @@ -60,7 +62,7 @@ jobs: run: coveralls - name: Upload pytest-mpl artifacts if: "${{ failure() && matrix.use-mpl != '' }}" - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: "pytest-mpl-results-${{ matrix.test-env }}" path: /tmp/salem-mpl-results/ diff --git a/ci/requirements-py313-all.yml b/ci/requirements-py313-all.yml new file mode 100644 index 0000000..d39a736 --- /dev/null +++ b/ci/requirements-py313-all.yml @@ -0,0 +1,26 @@ +name: test_env +channels: + - conda-forge +dependencies: + - python=3.13 + - numpy + - scipy + - pyproj + - joblib + - netCDF4 + - shapely + - geopandas + - rasterio + - pandas + - xarray + - dask + - matplotlib + - scikit-image + - Pillow + - cartopy + - pip + - pip: + - coveralls==3.2.0 + - pytest-cov + - pytest-mpl + - motionless diff --git a/ci/requirements-py314-all.yml b/ci/requirements-py314-all.yml new file mode 100644 index 0000000..7ae04f9 --- /dev/null +++ b/ci/requirements-py314-all.yml @@ -0,0 +1,26 @@ +name: test_env +channels: + - conda-forge +dependencies: + - python=3.14 + - numpy + - scipy + - pyproj + - joblib + - netCDF4 + - shapely + - geopandas + - rasterio + - pandas + - xarray + - dask + - matplotlib + - scikit-image + - Pillow + - cartopy + - pip + - pip: + - coveralls==3.2.0 + - pytest-cov + - pytest-mpl + - motionless diff --git a/docs/whats-new.rst b/docs/whats-new.rst index 10c5d24..3024793 100644 --- a/docs/whats-new.rst +++ b/docs/whats-new.rst @@ -5,7 +5,8 @@ What's New v0.3.x (Unreleased) ------------------- - +- address deprecations, including dropping support for numpy and pandas below +versions 2.0 (:pull:`259`). v0.3.11 (12 July 2024) ---------------------- diff --git a/pyproject.toml b/pyproject.toml index db9de26..b0e7675 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,9 @@ 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.13", + "Programming Language :: Python :: 3.14", ] requires-python = ">=3.8" dependencies = [ diff --git a/salem/tests/test_graphics.py b/salem/tests/test_graphics.py index 8d471ee..28ff751 100644 --- a/salem/tests/test_graphics.py +++ b/salem/tests/test_graphics.py @@ -934,6 +934,8 @@ def test_colormaps(): cb = mpl.colorbar.ColorbarBase(ax, cmap=get_cmap(cm), orientation='horizontal') cb.set_label(cm); + # force identical ticks to baseline, since we want to check the colours + cb.set_ticks(np.arange(0, 1.1, 0.1)) return fig