Merge branch 'main' into gpu-python3.12

.readthedocs.yml

@@ -1,12 +1,27 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: "ubuntu-22.04"
   tools:
     python: "mambaforge-4.10"
+  jobs:
+    pre_install:
+      # Avoid `git` treating the directory is dirty due to RTD changes.
+      # ref: https://docs.readthedocs.io/en/stable/build-customization.html#avoid-having-a-dirty-git-index
+      - >-
+        git update-index --assume-unchanged
+        continuous_integration/environment-doc.yml
+        docs/conf.py
+      # If we missed any, error and list the changed files.
+      - git diff --stat --exit-code
 
 sphinx:
   configuration: docs/conf.py
 
 conda:
   environment: continuous_integration/environment-doc.yml
+
+python:
+  install:
+    - method: pip
+      path: .

HISTORY.rst

@@ -2,6 +2,73 @@
 History
 =======
 
+2024.5.0 (2024-05-17)
+----------------------
+
+We're pleased to announce the release of dask-image 2024.5.0!
+
+Highlights
+
+Highlights of this release include:
+
+* Martin Schorb adding 'rotate', 'spline_filter' and 'spline_filter1d' functions (#213)
+* Erik Holmgren adding functionality to allow wrapping labels over array boundaries (#344), and 
+* Christoph Sommer's work allowing aicsimageio and other da.core.Array sub-classes as input arrays (#361)
+
+New Features
+
+* Add the rotate, spline_filter, and spline_filter1d functions to ndimage (#213)
+* Wrapping labels over array boundaries (#344)
+* Add python 3.12 support (#370)
+
+Improvements
+
+* Relaxed type check of input array, to allow da.core.Array sub-classes… (#361)
+* Update slice index comment to reflect code change (#353)
+
+Maintenance
+
+* Switch to pyproject.toml package setup, replace versioneer with setuptools-scm (#306)
+* Fix cupy pytest errors (#368)
+* Switch to newer GPU CI images (#345)
+* Bump GPU CI to CUDA 11.8 (#348)
+* Maintenance: fix CI test errors (#366)
+* Update CI test environments (#367)
+* Additions to release guide and change to release note generation script (#339)
+* Fix typo in pull request template (#347)
+* Workaround for the sphinx version problem in the readthedocs build environment (#354)
+* Pin dask to 2024.4.1 to avoid error during dask.dataframe import with python 3.11.9 (#363)
+* Get rid of distutils dependency -- Depend on newer scipy (#346)
+* Bump actions/checkout from 3 to 4 (#342)
+* Bump actions/setup-python from 4 to 5 (#350)
+* Bump coverallsapp/github-action from 2.2.1 to 2.2.3 (#343)
+* Bump conda-incubator/setup-miniconda from 2 to 3 (#349)
+* Bump coverallsapp/github-action from 2.2.3 to 2.3.0 (#365)
+* Update versioneer to version 0.29 for compatibility with python 3.12 (#357)
+
+
+9 authors added to this release (alphabetical)
+
+* `Charles Blackmon-Luca <https://github.com/dask/dask-image/commits?author=charlesbluca>`_ - @charlesbluca
+* `Christoph Sommer <https://github.com/dask/dask-image/commits?author=sommerc>`_ - @sommerc
+* `dependabot[bot] <https://github.com/dask/dask-image/commits?author=dependabot[bot]>`_ - @dependabot[bot]
+* `Erik Holmgren <https://github.com/dask/dask-image/commits?author=Holmgren825>`_ - @Holmgren825
+* `Genevieve Buckley <https://github.com/dask/dask-image/commits?author=GenevieveBuckley>`_ - @GenevieveBuckley
+* `jakirkham <https://github.com/dask/dask-image/commits?author=jakirkham>`_ - @jakirkham
+* `Mark Harfouche <https://github.com/dask/dask-image/commits?author=hmaarrfk>`_ - @hmaarrfk
+* `Martin Schorb <https://github.com/dask/dask-image/commits?author=martinschorb>`_ - @martinschorb
+* `Marvin Albert <https://github.com/dask/dask-image/commits?author=m-albert>`_ - @m-albert
+
+
+5 reviewers added to this release (alphabetical)
+
+* `Erik Holmgren <https://github.com/dask/dask-image/commits?author=Holmgren825>`_ - @Holmgren825
+* `Genevieve Buckley <https://github.com/dask/dask-image/commits?author=GenevieveBuckley>`_ - @GenevieveBuckley
+* `jakirkham <https://github.com/dask/dask-image/commits?author=jakirkham>`_ - @jakirkham
+* `Juan Nunez-Iglesias <https://github.com/dask/dask-image/commits?author=jni>`_ - @jni
+* `Marvin Albert <https://github.com/dask/dask-image/commits?author=m-albert>`_ - @m-albert
+
+
 2023.08.1 (2023-08-04)
 ----------------------
 

continuous_integration/gpuci/axis.yaml

@@ -1,5 +1,7 @@
 PYTHON_VER:
 - "3.9"
+- "3.10"
+- "3.11"
 - "3.12"
 
 CUDA_VER:

continuous_integration/gpuci/build.sh

@@ -41,7 +41,7 @@ rapids-logger "Activate conda env"
 conda activate dask_image
 
 rapids-logger "Install cupy"
-python -m pip install cupy-cuda112 -f https://pip.cupy.dev/pre
+python -m pip install cupy-cuda11x -f https://pip.cupy.dev/pre
 
 rapids-logger "Install dask-image"
 python -m pip install .

docs/conf.py

@@ -71,6 +71,10 @@
 release = dask_image._version.__version__
 # The short X.Y.Z version.
 version = '.'.join(release.split('.')[:3])
+if "dev" in release:
+    display_version = "(development version)"
+else:
+    display_version = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -130,11 +134,11 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+html_title = f"{project} {display_version} documentation"
 
 # A shorter title for the navigation bar.  Default is the same as
 # html_title.
-#html_short_title = None
+html_short_title = f"{project} docs"
 
 # The name of an image file (relative to this directory) to place at the
 # top of the sidebar.

docs/release/release_guide.rst

@@ -18,7 +18,7 @@ to complete the release process:
 
 .. code-block:: bash
 
-   pip install PyGithub>=1.44.1 twine>=3.1.1 tqdm
+   pip install "PyGithub>=1.44.1" "twine>=3.1.1" tqdm
 
 
 

pyproject.toml

@@ -25,12 +25,10 @@ classifiers = [
 ]
 dependencies = [
     "dask[array,dataframe] >=2024.4.1",
-    "numpy >=1.11.3",
-    "scikit-image >=0.19.3",
-    "scipy >=0.19.1",
+    "numpy >=1.18",
+    "scipy >=1.7.0",
     "pandas >=2.0.0",
     "pims >=0.4.1",
-    "slicerator >= 1.1.0",
     "tifffile >=2018.10.18",
 ]
 
@@ -56,6 +54,7 @@ gpu = [
 "Source Code" = "https://github.com/dask/dask-image"
 
 [tool.setuptools_scm]
+version_scheme = "no-guess-dev"
 version_file = "dask_image/_version.py"
 
 [tool.setuptools]