From 1897f0c09a06344a3c9c5206846d36bcb315371f Mon Sep 17 00:00:00 2001
From: Marina Moreira <67443181+marinagmoreira@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:42:58 -0800
Subject: [PATCH] fixing networkx install for analyst build (#154)

* fixing networkx install for analyst build

* fix ident

* uncommenting forgotten section

* fixing syntax on push file
---
 .github/workflows/ci_pr.yml       | 10 ++++------
 .github/workflows/ci_push.yml     | 14 +++++---------
 scripts/docker/analyst.Dockerfile |  1 +
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci_pr.yml b/.github/workflows/ci_pr.yml
index abe63bad..7cf85928 100644
--- a/.github/workflows/ci_pr.yml
+++ b/.github/workflows/ci_pr.yml
@@ -61,9 +61,7 @@ jobs:
                           --build-arg REMOTE=ghcr.io/nasa
                           -t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04
 
-    # Temp disabling the analyst build because it has a new version conflict issue. Re-enable once
-    # #136 is fixed.
-    #- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
-    #  run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
-    #                      --build-arg REMOTE=ghcr.io/nasa
-    #                      -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
+    - name: Build analyst image isaac/isaac:msgs-ubuntu20.04
+      run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
+                         --build-arg REMOTE=ghcr.io/nasa
+                         -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
diff --git a/.github/workflows/ci_push.yml b/.github/workflows/ci_push.yml
index d4c652f5..23e0e5b7 100644
--- a/.github/workflows/ci_push.yml
+++ b/.github/workflows/ci_push.yml
@@ -57,13 +57,10 @@ jobs:
                           --build-arg REMOTE=ghcr.io/nasa
                           -t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04
 
-    # Temp disabling the analyst build because it has a version conflict issue. Re-enable once
-    # #136 is fixed.
-    # *** Remember to uncomment the push below, as well!
-    #- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
-    #  run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
-    #                      --build-arg REMOTE=ghcr.io/nasa
-    #                      -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
+    - name: Build analyst image isaac/isaac:msgs-ubuntu20.04
+      run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
+                         --build-arg REMOTE=ghcr.io/nasa
+                         -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
 
 
     - name: Log in to registry
@@ -75,5 +72,4 @@ jobs:
         if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:latest-ubuntu20.04; fi;
         if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:astrobee-msgs-ubuntu20.04; fi;
         if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04; fi;
-        # Re-enable once #136 is fixed.
-        # if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest; fi;
+        if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest; fi;
diff --git a/scripts/docker/analyst.Dockerfile b/scripts/docker/analyst.Dockerfile
index 24451887..c0f69bed 100644
--- a/scripts/docker/analyst.Dockerfile
+++ b/scripts/docker/analyst.Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update \
 
 RUN pip3 install pyArango \
     && pip3 install jupyterlab jupyterhub nbconvert Pygments==2.6.1 jupyros \
+    && pip3 install networkx==3.1 \
     && pip3 install matplotlib opencv-python numpy-quaternion pandas \
     && pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu