From 907d07696d71249cfb0a2341b77a23739ee71dfb Mon Sep 17 00:00:00 2001
From: Oliver KI3P <154598898+KI3P@users.noreply.github.com>
Date: Wed, 3 Jul 2024 20:21:58 -0400
Subject: [PATCH 1/2] Update setup.sh

Added venv support to install older version of numpy that appears to be required by the libraries
---
 setup.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index aa356ac..0aa9d20 100644
--- a/setup.sh
+++ b/setup.sh
@@ -54,9 +54,13 @@ sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev li
 
 sudo apt-get install python3-pip
 
-pip3 install matplotlib numpy scipy qtpy
+# Create a venv and install the appropriate versions of numpy etc
+python -m venv ${PYTHONPATH}
+source ${PYTHONPATH}/bin/activate
 
-python3 setup.py install --user
+pip3 install matplotlib==3.8.4 numpy==1.26.0 scipy==1.13.1 qtpy pyqt5
+
+python3 setup.py install
 else
 echo "Pylap is already setup"
 echo "if you wish to redo the setup enter the command 'nano .bashrc' in the home directory, delete the filepaths and then run the setup.sh script again"

From 97d9ba9272fa416669cfc0db1dba77dd8e89814b Mon Sep 17 00:00:00 2001
From: Oliver KI3P <154598898+KI3P@users.noreply.github.com>
Date: Wed, 3 Jul 2024 20:23:14 -0400
Subject: [PATCH 2/2] Update README.md

Added venv instructions to manual setup
---
 README.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index cee36c9..a77e454 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ File Directory model
 
 ├── PyLap Project folder  
    &emsp;├── PyLap\
-   &emsp;├── PHARLAP\
+   &emsp;├── pharlap_4.5.1\
    &emsp;└── l_comp_lib_2020.4.304_comp.for_redist\
 
 
@@ -57,13 +57,17 @@ File Directory model
 
 12. sudo apt-get install python3-pip
 
-13. pip3 install matplotlib numpy scipy qtpy
+13. python -m venv ${PYTHONPATH}
 
-14. cd $PYTHONPATH 
+14. source ${PYTHONPATH}/bin/activate
 
-15. python3 setup.py install --user
+15. pip3 install matplotlib==3.8.4 numpy==1.26.0 scipy==1.13.1 qtpy pyqt5
 
-16. Use Example folder files as templates to test the installation
+16. cd ${PYTHONPATH}
+
+17. python3 setup.py install
+
+18. Use Example folder files as templates to test the installation
 
     *Note* This is not a one time setup and will have to be redone if the terminal is closed out or if the code project is closed out *Note*