removing remaining Pygraphviz mentions (#254)

* removing remaining Pygraphviz mentions * fixing ci * fixing ci --------- Co-authored-by: QuantumBlack Labs <[email protected]>
mckinsey · Apr 25, 2023 · 5305dc3 · 5305dc3
1 parent 7195d02
commit 5305dc3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 
 images:
   python: &python
-    - image: circleci/buildpack-deps:stretch-browsers
+    - image: circleci/buildpack-deps
 
 machines:
   win-python: &win-python
@@ -62,10 +62,7 @@ utils:
       conda install -y virtualenv
       pip install -U pip setuptools wheel
       conda install -y cython
-      conda install -c anaconda graphviz=2.50.0 # to be able to import pygraphviz
       pip install -r requirements.txt -U
-      #pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
-      pip install --global-option=build_ext --global-option="-IC:\tools\miniconda3\pkgs\graphviz-2.50.0-hdb8b0d4_0\Library\include" --global-option="-LC:\tools\miniconda3\pkgs\graphviz-2.50.0-hdb8b0d4_0\Library\lib" pygraphviz
       pip install -r test_requirements.txt -U
       pip install ".[pytorch]"
 

diff --git a/devel-cpu.Dockerfile b/devel-cpu.Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -y && apt install -y python3.8 python3-pip libgraphviz-dev graphviz
+RUN apt-get update -y && apt install -y python3.8 python3-pip
 RUN ln -s $(which python3) /usr/local/bin/python
 #COPY requirements.txt test_requirements.txt tmp/
 COPY . /tmp

diff --git a/devel-gpu.Dockerfile b/devel-gpu.Dockerfile
@@ -2,7 +2,7 @@ FROM nvidia/cuda:11.7.0-base-ubuntu20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -y && apt install -y python3.8 python3-pip libgraphviz-dev graphviz
+RUN apt-get update -y && apt install -y python3.8 python3-pip
 RUN ln -s $(which python3) /usr/local/bin/python
 # Copy all files to container as intalling .[pytorch] requires setup.py, which requires other files
 COPY . /tmp

diff --git a/doc_requirements.txt b/doc_requirements.txt
@@ -11,7 +11,6 @@ nbstripout==0.3.3
 patchy>=1.5, <2.0
 pydot>=1.4, <2.0
 pygments>=2.6.1, <3.0
-pygraphviz>=1.5, <2.0
 recommonmark>=0.5.0, <1.0
 sphinx-autodoc-typehints>=1.6.0, <2.0
 sphinx-markdown-tables>=0.0.15, <1.0

diff --git a/tests/test_plotting.py b/tests/test_plotting.py
@@ -49,7 +49,7 @@ def test_all_nodes_exist(self):
         assert all(node in a_graph.get_nodes() for node in ["a", "b", "c"])
 
     def test_all_edges_exist(self):
-        """All edges in original graph should exist in pygraphviz graph"""
+        """All edges in original graph should exist in graph"""
         edges = [(str(a), str(a + b + 1)) for a in range(2) for b in range(3)]
         sm = StructureModel(edges)
         a_graph = plot_structure(sm)