From 3b9af390bd8526c20838815db830465ba625bd96 Mon Sep 17 00:00:00 2001
From: chetanyagoyal <chetanya.goyal@research.iiit.ac.in>
Date: Fri, 4 Oct 2024 09:53:53 +0000
Subject: [PATCH] fix numpy version to 1.23.5

---
 .github/workflows/glayout_opamp_sim.yml                        | 3 ++-
 docker/conda/Dockerfile                                        | 1 -
 openfasoc/generators/glayout/requirements.txt                  | 1 +
 .../generators/glayout/tapeout/tapeout_and_RL/requirements.txt | 3 +--
 requirements.txt                                               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml
index cf9eb9fcf..bd6ce1a64 100644
--- a/.github/workflows/glayout_opamp_sim.yml
+++ b/.github/workflows/glayout_opamp_sim.yml
@@ -38,9 +38,10 @@ jobs:
                       bash -c "\
                       cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/. &&\
                       pip uninstall glayout -y &&\
-                      pip3 install -r requirements.txt &&\
+                      pip3 install -r ./openfasoc/generators/glayout/requirements.txt &&\
                       cd ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/ &&\
                       pip3 install prettyprint prettyprinttree gdstk &&\
+                      pip3 install -r requirements.txt
                       python3 test_glayout_ci.py --component opamp_parametric
                       " && exit_code=$? | tee -a glayout.log
                   if [ $? -ne 0 ]; then exit 1; fi
diff --git a/docker/conda/Dockerfile b/docker/conda/Dockerfile
index 3a1768ab5..0ee98e006 100755
--- a/docker/conda/Dockerfile
+++ b/docker/conda/Dockerfile
@@ -27,7 +27,6 @@ ENV PDK_ROOT=/usr/bin/miniconda3/share/pdk/
 RUN wget https://www.klayout.org/downloads/Ubuntu-22/klayout_0.28.17-1_amd64.deb
 RUN dpkg -i klayout_0.28.17-1_amd64.deb
 RUN pip install glayout
-RUN pip install numpy==1.23.5 
 #RUN strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
 
 COPY ./scripts /scripts
diff --git a/openfasoc/generators/glayout/requirements.txt b/openfasoc/generators/glayout/requirements.txt
index 02a3f6895..ec5462945 100644
--- a/openfasoc/generators/glayout/requirements.txt
+++ b/openfasoc/generators/glayout/requirements.txt
@@ -1,4 +1,5 @@
 gdsfactory==7.7.0
+numpy==1.23.5
 prettyprint
 prettyprinttree
 nltk
diff --git a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt
index 91fa553fb..46fd69aa6 100644
--- a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt
+++ b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt
@@ -3,5 +3,4 @@ scikit-learn
 matplotlib
 scipy
 seaborn
-prettyprinttree
-numpy==1.23.5
\ No newline at end of file
+prettyprinttree
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 8dab2f16b..f48a42e9d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 pandas
 klayout
-numpy==1.23.5
+numpy
 matplotlib
 gdsfactory==7.7.0
 nbsphinx