From b7c7f1b40d4916108504695c667808b8b9910527 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 Dec 2024 19:54:31 +0000 Subject: [PATCH 1/3] Remove sphinx pinning --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c5f683afd0..234e7883cc 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -64,9 +64,9 @@ dependencies: - scikit-learn>=0.23.1 - scipy - setuptools>=61.0.0 +- sphinx - sphinx-copybutton - sphinx-markdown-tables -- sphinx<6 - sphinxcontrib-websupport - thriftpy2!=0.5.0,!=0.5.1 - torchdata diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 21eda1c098..c1e51ce5b7 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -69,9 +69,9 @@ dependencies: - scikit-learn>=0.23.1 - scipy - setuptools>=61.0.0 +- sphinx - sphinx-copybutton - sphinx-markdown-tables -- sphinx<6 - sphinxcontrib-websupport - thriftpy2!=0.5.0,!=0.5.1 - torchdata diff --git a/dependencies.yaml b/dependencies.yaml index 9ee9031440..70afedbb6e 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -336,7 +336,7 @@ dependencies: - recommonmark - sphinx-copybutton - sphinx-markdown-tables - - sphinx<6 + - sphinx - sphinxcontrib-websupport py_version: specific: From 9af918ae044e7425703db78c1e0a1860c8234f5e Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 Dec 2024 13:58:34 -0800 Subject: [PATCH 2/3] Get a new enough breathe version from pip --- conda/environments/all_cuda-118_arch-x86_64.yaml | 3 ++- conda/environments/all_cuda-125_arch-x86_64.yaml | 3 ++- dependencies.yaml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 234e7883cc..05967d329b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -8,7 +8,6 @@ channels: - nvidia dependencies: - aiohttp -- breathe - c-compiler - certifi - cmake>=3.26.4,!=3.30.0 @@ -75,4 +74,6 @@ dependencies: - ucx-py==0.42.*,>=0.0.0a0 - wget - wheel +- pip: + - breathe>4.35.0 name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index c1e51ce5b7..01b97c331c 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -8,7 +8,6 @@ channels: - nvidia dependencies: - aiohttp -- breathe - c-compiler - certifi - cmake>=3.26.4,!=3.30.0 @@ -80,4 +79,6 @@ dependencies: - ucx-py==0.42.*,>=0.0.0a0 - wget - wheel +- pip: + - breathe>4.35.0 name: all_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 70afedbb6e..724d793758 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -326,7 +326,6 @@ dependencies: common: - output_types: [conda] packages: - - breathe - doxygen - graphviz - ipython @@ -338,6 +337,9 @@ dependencies: - sphinx-markdown-tables - sphinx - sphinxcontrib-websupport + - pip: + # Need new enough breathe + - breathe>4.35.0 py_version: specific: - output_types: [conda] From 76577b702179ea5288284bba7018fc8a33b204f1 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 Dec 2024 14:09:36 -0800 Subject: [PATCH 3/3] Fix pinning --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 05967d329b..0345cf346f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -75,5 +75,5 @@ dependencies: - wget - wheel - pip: - - breathe>4.35.0 + - breathe>=4.35.0 name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 01b97c331c..6232dbdede 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -80,5 +80,5 @@ dependencies: - wget - wheel - pip: - - breathe>4.35.0 + - breathe>=4.35.0 name: all_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 724d793758..972a5be1f0 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -339,7 +339,7 @@ dependencies: - sphinxcontrib-websupport - pip: # Need new enough breathe - - breathe>4.35.0 + - breathe>=4.35.0 py_version: specific: - output_types: [conda]