From 53afaba88e6138d9e309e351849ba5fe0d5e21ea Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 Dec 2024 22:59:02 -0800 Subject: [PATCH] Remove sphinx pinning (#4839) This pinning was needed for [historical reasons that are no longer relevant](https://github.com/rapidsai/cucim/pull/481/commits/5cbc80b3a7fa49f25959674d3a97e6d8cf503fcb). Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/cugraph/pull/4839 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 5 +++-- conda/environments/all_cuda-125_arch-x86_64.yaml | 5 +++-- dependencies.yaml | 6 ++++-- 3 files changed, 10 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 7b2fddb742..27b3779bac 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 @@ -63,9 +62,9 @@ dependencies: - scikit-learn>=0.23.1 - scipy - setuptools>=61.0.0 +- sphinx - sphinx-copybutton - sphinx-markdown-tables -- sphinx<6 - sphinxcontrib-websupport - thriftpy2>=0.4.15,!=0.5.0,!=0.5.1 - torchdata @@ -73,4 +72,6 @@ dependencies: - ucx-proc=*=gpu - ucx-py==0.42.*,>=0.0.0a0 - 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 87a2417bbc..10ed259539 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 @@ -68,9 +67,9 @@ dependencies: - scikit-learn>=0.23.1 - scipy - setuptools>=61.0.0 +- sphinx - sphinx-copybutton - sphinx-markdown-tables -- sphinx<6 - sphinxcontrib-websupport - thriftpy2>=0.4.15,!=0.5.0,!=0.5.1 - torchdata @@ -78,4 +77,6 @@ dependencies: - ucx-proc=*=gpu - ucx-py==0.42.*,>=0.0.0a0 - wheel +- pip: + - breathe>=4.35.0 name: all_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index eb4bb68dc9..cbb1085d8c 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -334,7 +334,6 @@ dependencies: common: - output_types: [conda] packages: - - breathe - doxygen - graphviz - ipython @@ -344,8 +343,11 @@ dependencies: - recommonmark - sphinx-copybutton - sphinx-markdown-tables - - sphinx<6 + - sphinx - sphinxcontrib-websupport + - pip: + # Need new enough breathe + - breathe>=4.35.0 py_version: specific: - output_types: [conda]