diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index b1c1a0828aa..9642227a2bf 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest env: ASV_DIR: "./asv_bench" - CONDA_ENV_FILE: ci/requirements/environment-benchmark.yml + CONDA_ENV_FILE: ci/requirements/environment.yml steps: # We need the full repo to avoid this issue diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index b377542e402..0f2768589c7 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // The Pythons you'd like to test against. If not provided, defaults // to the current version of Python used to run `asv`. - "pythons": ["3.11"], + "pythons": ["3.13"], // The matrix of dependencies to test. Each key is the name of a // package (in PyPI) and the values are version numbers. An empty @@ -59,8 +59,8 @@ // "pip+emcee": [""], // emcee is only available for install with pip. // }, "matrix": { - "setuptools_scm": [""], // GH6609 - "numpy": ["2.2"], + "setuptools": [""], + "numpy": [""], "pandas": [""], "netcdf4": [""], "scipy": [""], @@ -69,14 +69,14 @@ "distributed": [""], "flox": [""], "numpy_groupies": [""], - "sparse": [""], + "sparse": ["0.15"], "cftime": [""] }, // fix for bad builds // https://github.com/airspeed-velocity/asv/issues/1389#issuecomment-2076131185 "build_command": [ "python -m build", - "python -mpip wheel --no-deps --no-build-isolation --no-index -w {build_cache_dir} {build_dir}" + "python -m pip wheel --no-deps --no-build-isolation --no-index -w {build_cache_dir} {build_dir}" ], // Combinations of libraries/python versions can be excluded/included // from the set to test. Each entry is a dictionary containing additional diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index cc33d8b4681..2e4d1ba052d 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -47,7 +47,7 @@ dependencies: - rasterio - scipy - seaborn - - sparse + - sparse>=0.15 - toolz - types-colorama - types-docutils diff --git a/pyproject.toml b/pyproject.toml index bc899596b4c..2356de0b06c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,12 +13,13 @@ classifiers = [ ] description = "N-D labeled arrays and datasets in Python" dynamic = ["version"] -license = "Apache-2.0" +# license = "Apache-2.0" +license = { file = "LICENSE.txt" } name = "xarray" readme = "README.md" requires-python = ">=3.11" -dependencies = ["numpy>=1.26", "packaging>=24.1", "pandas>=2.2"] +dependencies = ["numpy>=1.26", "packaging>=24.2", "pandas>=2.2"] # We don't encode minimum requirements here (though if we can write a script to # generate the text from `min_deps_check.py`, that's welcome...). We do add