diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c6702064..af2e27ba7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ env: concurrency: # For a given workflow, if we push to the same branch, cancel all previous builds on that branch except on main. - group: ${{ github.workflow }}-${{ github.ref }} + group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} permissions: diff --git a/CHANGES.rst b/CHANGES.rst index f6ad34277..6252a9cd5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,10 @@ Announcements ^^^^^^^^^^^^^ * `xclim` has migrated its development branch name from `master` to `main`. (:issue:`1667`, :pull:`1669`). +Breaking changes +^^^^^^^^^^^^^^^^ +* Added the `tox-gh` dependency to the development installation recipe. This will soon be required for running the `tox` test ensemble on GitHub Workflows. (:pull:`1709`). + Bug fixes ^^^^^^^^^ * Fixed an bug in sdba's ``map_groups`` that prevented passing DataArrays with cftime coordinates if the ``sdba_encode_cf`` option was True. (:issue:`1673`, :pull:`1674`). @@ -20,7 +24,8 @@ Bug fixes Internal changes ^^^^^^^^^^^^^^^^ * Added "doymin" and "doymax" to the possible operations of ``generic.stats``. Fixed a warning issue when ``op`` was "integral". (:pull:`1672`). - +* Reorganized GitHub CI build matrices to run the doctests more consistently. (:pull:`1709`). +* Removed the experimental `numba` and `llvm` dependency installation steps in the `tox.ini` file. Added `numba@main` to the upstream dependencies. (:pull:`1709`). v0.48.2 (2024-02-26) -------------------- diff --git a/requirements_upstream.txt b/requirements_upstream.txt index 4758fded4..71145c0ce 100644 --- a/requirements_upstream.txt +++ b/requirements_upstream.txt @@ -1,4 +1,5 @@ bottleneck @ git+https://github.com/pydata/bottleneck.git@master cftime @ git+https://github.com/Unidata/cftime.git@master flox @ git+https://github.com/xarray-contrib/flox.git@main +numba @ git+https://github.com/numba/numba.git@main xarray @ git+https://github.com/pydata/xarray.git@main