From 965d494cb2d61cde1c063d372fb72e196061ad12 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 31 Jan 2025 16:09:12 -0600 Subject: [PATCH 1/2] raise setuptools floor to 61.0.0, other small dependencies cleanup --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- conda/recipes/cucim/meta.yaml | 2 +- dependencies.yaml | 9 ++++----- python/cucim/pyproject.toml | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 8a83a3cb..4c205731 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -25,7 +25,7 @@ dependencies: - nbsphinx - ninja - numpy>=1.23.4,<3.0a0 -- numpydoc>=1.5 +- numpydoc>=1.7 - nvcc_linux-64=11.8 - openslide-python>=1.3.0 - pip diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 01506e8c..10db7a87 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -25,7 +25,7 @@ dependencies: - nbsphinx - ninja - numpy>=1.23.4,<3.0a0 -- numpydoc>=1.5 +- numpydoc>=1.7 - openslide-python>=1.3.0 - pip - pooch>=1.6.0 diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml index 6ac669a8..f7ed9387 100644 --- a/conda/recipes/cucim/meta.yaml +++ b/conda/recipes/cucim/meta.yaml @@ -65,7 +65,7 @@ requirements: - rapids-build-backend >=0.3.0,<0.4.0.dev0 - scikit-image >=0.19.0,<0.25.0a0 - scipy >=1.6 - - setuptools >=24.2.0 + - setuptools >=61.0.0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major != "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index eebba5f9..287b56e1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -234,7 +234,7 @@ dependencies: packages: - ipython - nbsphinx - - numpydoc>=1.5 + - &numpydoc numpydoc>=1.7 - pydata-sphinx-theme - recommonmark # TODO: sphinx upper version limit can likely be removed after pydata 0.13 @@ -264,7 +264,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - rapids-build-backend>=0.3.0,<0.4.0.dev0 - - setuptools>=24.2.0 + - setuptools>=61.0.0 run: common: - output_types: [conda, requirements, pyproject] @@ -319,7 +319,6 @@ dependencies: - openslide-python>=1.3.0; platform_machine=='x86_64' - matplotlib>=3.7 - opencv-python-headless>=4.6 - - output_types: [pyproject] + - output_types: [pyproject, requirements] packages: - # Already added to requirements via docs. This is for tests. - - numpydoc>=1.7 + - *numpydoc diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml index d59f852f..1769ee69 100644 --- a/python/cucim/pyproject.toml +++ b/python/cucim/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "rapids_build_backend.build" requires = [ "rapids-build-backend>=0.3.0,<0.4.0.dev0", - "setuptools>=24.2.0", + "setuptools>=61.0.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project] @@ -80,7 +80,7 @@ developer = [ docs = [ "ipython", "nbsphinx", - "numpydoc>=1.5", + "numpydoc>=1.7", "pydata-sphinx-theme", "recommonmark", "sphinx<6", From 195d853bee83b504cd24a0fcbf6ab81180dbf823 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 3 Feb 2025 07:59:19 -0600 Subject: [PATCH 2/2] try allowing newer sphinx --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- dependencies.yaml | 4 +--- python/cucim/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 4c205731..d811336d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -42,7 +42,7 @@ dependencies: - recommonmark - scikit-image>=0.19.0,<0.26.0a0 - scipy>=1.11.2 -- sphinx<6 +- sphinx>=8.0.0 - sysroot_linux-64==2.28 - tifffile>=2022.8.12 - yasm diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 10db7a87..95fb3ac0 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -41,7 +41,7 @@ dependencies: - recommonmark - scikit-image>=0.19.0,<0.26.0a0 - scipy>=1.11.2 -- sphinx<6 +- sphinx>=8.0.0 - sysroot_linux-64==2.28 - tifffile>=2022.8.12 - yasm diff --git a/dependencies.yaml b/dependencies.yaml index 287b56e1..7ed0cedd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -237,9 +237,7 @@ dependencies: - &numpydoc numpydoc>=1.7 - pydata-sphinx-theme - recommonmark - # TODO: sphinx upper version limit can likely be removed after pydata 0.13 - # is released. See https://github.com/pydata/pydata-sphinx-theme/issues/1094 - - sphinx<6 + - sphinx>=8.0.0 py_version: specific: - output_types: conda diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml index 1769ee69..44c4d130 100644 --- a/python/cucim/pyproject.toml +++ b/python/cucim/pyproject.toml @@ -83,7 +83,7 @@ docs = [ "numpydoc>=1.7", "pydata-sphinx-theme", "recommonmark", - "sphinx<6", + "sphinx>=8.0.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.entry-points."console_scripts"]