From 4b2ddac14b8b349caf61cbbde098eefbb16c7b6b Mon Sep 17 00:00:00 2001 From: Tom White Date: Sat, 13 Apr 2024 14:54:03 +0100 Subject: [PATCH] Allow networkx 3.3 now that pydot issue has been fixed (https://github.com/networkx/networkx/pull/7204) --- cubed/core/plan.py | 5 +++-- docs/requirements.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cubed/core/plan.py b/cubed/core/plan.py index ba8b64fa..43f88802 100644 --- a/cubed/core/plan.py +++ b/cubed/core/plan.py @@ -399,8 +399,9 @@ def visualize( del d["target"] - d["label"] = label.strip() - d["tooltip"] = tooltip.strip() + # quote strings with colons in them (https://github.com/pydot/pydot/issues/258) + d["label"] = '"' + label.strip() + '"' + d["tooltip"] = '"' + tooltip.strip() + '"' if "name" in d: # pydot already has name del d["name"] diff --git a/docs/requirements.txt b/docs/requirements.txt index a977af60..6f8d4809 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,7 +4,7 @@ fsspec lithops[aws] >= 2.7.0 modal-client mypy_extensions # for rechunker -networkx < 2.8.3 # https://github.com/networkx/networkx/pull/5667 +networkx != 2.8.3, != 2.8.4, != 2.8.5, != 2.8.6, != 2.8.7, != 2.8.8, != 3.0.*, != 3.1.*, != 3.2.* numpy >= 1.22 pydot pytest diff --git a/pyproject.toml b/pyproject.toml index 5bd08244..d582ec89 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dependencies = [ "donfig", "fsspec", "mypy_extensions", # for rechunker - "networkx < 2.8.3", + "networkx != 2.8.3, != 2.8.4, != 2.8.5, != 2.8.6, != 2.8.7, != 2.8.8, != 3.0.*, != 3.1.*, != 3.2.*", "numpy >= 1.22", "tenacity", "toolz", diff --git a/requirements.txt b/requirements.txt index 381ac93c..f4855566 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ aiostream array-api-compat fsspec mypy_extensions # for rechunker -networkx < 2.8.3 +networkx != 2.8.3, != 2.8.4, != 2.8.5, != 2.8.6, != 2.8.7, != 2.8.8, != 3.0.*, != 3.1.*, != 3.2.* numpy >= 1.22 tenacity toolz