From 91c7429981ba63f888464db68ce22b7c4221546f Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Fri, 25 Oct 2024 15:11:41 -0500
Subject: [PATCH 01/18] 1) ManagedProperties metaclass is no longer used by
 Basic in sympy and has been deprecated, functionality tested and no changes
 on tests 2) Slight wording change on comment of EnumSymbs class 3) Added
 __getstate__() and __setstate__() functions to EnumSymbs class as pickling
 was using default __getstate__() provided by basic which just returns null.
 This allows pickling to account for and store slotted variables and fixes
 basic_wick_test.py::test_ancr_character_has_basic_properties

---
 drudge/utils.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drudge/utils.py b/drudge/utils.py
index ac489e3..d97e349 100644
--- a/drudge/utils.py
+++ b/drudge/utils.py
@@ -89,7 +89,7 @@ def __call__(self, *args, **kwargs):
         return self._func(*args, **kwargs)
 
 
-class _EnumSymbsMeta(ManagedProperties):
+class _EnumSymbsMeta(type):
     """The meta class for enumeration symbols.
 
     The primary purpose of this metaclass is to set the concrete singleton
@@ -140,7 +140,7 @@ class EnumSymbs(AtomicExpr, metaclass=_EnumSymbsMeta):
 
     Subclasses can set `_symbs_` inside the class body to be a sequence of
     string pairs.  Then attributes named after the first field of the pairs will
-    be created, with the LaTeX form controlled by the second pair.
+    be created, with the LaTeX form controlled by the second field of the pair.
 
     The resulted values are valid SymPy expressions.  They are ordered according
     to their order in the given enumeration sequence.
@@ -222,6 +222,15 @@ def __rsub__(self, other):
         """
         return self.__sub__(other)
 
+    def __getstate__(self):
+        """Retrieve state of object for pickling/serialization"""
+        return {slot: getattr(self, slot) for slot in self.__slots__}
+
+    def __setstate__(self, state):
+        """Create state of object for deserialization"""
+        for key, value in state.items():
+            setattr(self, key, value)
+
     def sort_key(self, order=None):
         return (
             self.class_key(),

From de346191b24078180600946d28e4ecd587d58d9c Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Fri, 25 Oct 2024 17:01:37 -0500
Subject: [PATCH 02/18] Sharing state between tests was failing them. Running
 pytest in terminal did not run in parallel and so did not show the issue,
 running tests in vscode runs in parallel and thus more than half the tests
 failed when batch run (which some vscode users would do) but passed perfectly
 fine when run individually. Removing the scope='module' from the free algebra
 fixture disallows sharing state between tests and thus prevents collisions. I
 also did not notice any slowdown from forcing individual environment
 creations for each test.

---
 tests/free_algebra_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/free_algebra_test.py b/tests/free_algebra_test.py
index a45075e..45448b0 100644
--- a/tests/free_algebra_test.py
+++ b/tests/free_algebra_test.py
@@ -19,7 +19,7 @@
 from conftest import skip_in_spark
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture
 def free_alg(spark_ctx):
     """Initialize the environment for a free algebra."""
 

From d751911a93d1d3ddeccc07707604b48da55dd0a7 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 15 Jan 2025 15:25:19 -0600
Subject: [PATCH 03/18] changed simplify to simplify_am, simplify was
 attempting to numerically resolve a clebsch-gordan coefficient but the test
 was made to check a symbolic simplification, the clebsch-gordan function
 failed attempting to resolve a number to these symbols. Altering
 simplify->simplify_am passes test

---
 tests/nuclear_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/nuclear_test.py b/tests/nuclear_test.py
index 45093fc..fd9610f 100644
--- a/tests/nuclear_test.py
+++ b/tests/nuclear_test.py
@@ -113,6 +113,7 @@ def test_varsh_872_5(nuclear: NuclearBogoliubovDrudge):
 
     TODO: Investigate its failure in Apache Spark environment.
     """
+
     dr = nuclear
     a, alpha, b, beta, b_prm, beta_prm = symbols(
         'a alpha b beta bprm betaprm', integer=True
@@ -132,7 +133,7 @@ def test_varsh_872_5(nuclear: NuclearBogoliubovDrudge):
     )
     for sums_i in [sums, reversed(sums)]:
         tensor = dr.sum(*sums_i, amp)
-        res = tensor.deep_simplify().merge()
+        res = tensor.simplify_am().merge() #previously used deep_simplify
         assert res.n_terms == 1
         term = res.local_terms[0]
         assert len(term.sums) == 0

From ec3f690d6487b4aa649a74465b8ddea8f2a84d76 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Fri, 24 Jan 2025 14:41:09 -0600
Subject: [PATCH 04/18] Nucleartest 'doit' disabled to allow execution of
 simplify without attempting to resolve a symbolic clebsch-gordan coefficient.

Also added some comments to the drs function retrieval function
---
 drudge/drs.py         | 8 ++++----
 tests/nuclear_test.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drudge/drs.py b/drudge/drs.py
index d9c465b..eb976f3 100644
--- a/drudge/drs.py
+++ b/drudge/drs.py
@@ -347,13 +347,13 @@ def __missing__(self, key: str):
         if key.startswith('__') and key.endswith('__'):
             raise KeyError(key)
 
-        for entry, excl in self._path:
-            if hasattr(entry, key) and key not in excl:
-                resolv = getattr(entry, key)
+        for entry, excl in self._path: #For every module/variable in the environment
+            if hasattr(entry, key) and key not in excl: # check if our key is defined in it
+                resolv = getattr(entry, key) # if found, pull it from the environment
                 break
             else:
                 continue
-        else:
+        else: # if we didn't find earlier and break, default to defining it instead
             resolv = DrsSymbol(self._drudge, key)
         return resolv
 
diff --git a/tests/nuclear_test.py b/tests/nuclear_test.py
index fd9610f..6e5ccc2 100644
--- a/tests/nuclear_test.py
+++ b/tests/nuclear_test.py
@@ -209,7 +209,7 @@ def test_wigner3j_sum_to_wigner6j(nuclear: NuclearBogoliubovDrudge):
             ((-1) ** (j3 - m3) / (2 * j3 + 1))
             * KroneckerDelta(j3, jprm3) * KroneckerDelta(m3, mprm3)
             * Wigner6j(j1, j2, j3, j4, j5, j6)
-    ).expand().simplify()
+    ).expand().simplify(doit=False)
 
     # For performance reason, just test a random arrangement of the summations.
     random.shuffle(sums)

From 87c28336164468bcc1e055bddd38f6a4d31d6a8c Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 8 May 2025 16:10:32 -0500
Subject: [PATCH 05/18] typo fixed

---
 drudge/drudge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drudge/drudge.py b/drudge/drudge.py
index 8f9f6a0..f28bd7a 100644
--- a/drudge/drudge.py
+++ b/drudge/drudge.py
@@ -3490,7 +3490,7 @@ def _union(orig, new):
 
 
 def _inters(orig, new):
-    """Make the interaction of two sets.
+    """Make the intersection of two sets.
 
     If the original is a None value, a new set will be created with elements
     from the new set.  When both operands are None, the result is None.

From cb75cca4a74fd5c93b9d1ab06ecb9f0ddffafc93 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 10:05:15 -0500
Subject: [PATCH 06/18] install script

---
 install_in.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100755 install_in.sh

diff --git a/install_in.sh b/install_in.sh
new file mode 100755
index 0000000..c9021c3
--- /dev/null
+++ b/install_in.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# 
+#    INSTRUCTIONS:
+#      1) Run this With `source install_in.sh`
+# 
+ENV_NAME=drudge_testing
+
+# Conda env creation
+echo "Creating Conda Environment"
+conda create --name $ENV_NAME python=3.9 -y
+conda install --name $ENV_NAME --file env.txt -y
+
+conda init
+conda activate $ENV_NAME
+
+
+# Get Dummy Spark
+echo "Getting Dummy Spark"
+git clone https://github.com/DrudgeCAS/DummyRDD ./dummyRDD/
+
+# Clone repository
+#echo "Cloning Repositories"
+#git clone --recurse-submodules https://github.com/DrudgeCAS/drudge ./drudge/
+#cd drudge
+git submodule update --init --recursive
+
+
+# Setup Vars
+echo "Setting env vars"
+export PYTHONPATH=$(pwd)
+export DUMMY_SPARK=1
+
+# Build cpp files
+echo "Building cpp files"
+python3 setup.py build
+python3 setup.py install
+
+# Copy the cpp files where needed
+echo "Moving cpp files"
+cp build/lib.linux-x86_64-cpython-39/drudge/wickcore.cpython-39-x86_64-linux-gnu.so drudge/
+cp build/lib.linux-x86_64-cpython-39/drudge/canonpy.cpython-39-x86_64-linux-gnu.so drudge/
+
+# Add Dummy Spark
+echo "Moving Dummy Spark"
+cp -r ../dummyRDD/dummy_spark .
+
+
+echo "DONE!!!"
+echo  'Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started with development simply type '\''code .'\'' and you'\''ll open a vscode window at this location'
+

From 1bff9685ae55f8b1d6250a2b5737481660e5aea5 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 10:35:07 -0500
Subject: [PATCH 07/18] Does my auth work now?


From 7dabc3970aedeb5aa8201bb4fd4da86e90c26a12 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 12:28:43 -0500
Subject: [PATCH 08/18] Install Folder including Install Script and Environment
 Conda Files

---
 install/env_arm.txt                 |  6 ++++++
 install/env_x86.txt                 |  8 ++++++++
 install_in.sh => install/install.sh | 12 ++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 install/env_arm.txt
 create mode 100644 install/env_x86.txt
 rename install_in.sh => install/install.sh (79%)

diff --git a/install/env_arm.txt b/install/env_arm.txt
new file mode 100644
index 0000000..06e50a5
--- /dev/null
+++ b/install/env_arm.txt
@@ -0,0 +1,6 @@
+IPython==8.15.0
+sympy==1.13.2
+pyspark==3.4.1
+jinja2
+pytest
+coveralls
diff --git a/install/env_x86.txt b/install/env_x86.txt
new file mode 100644
index 0000000..3d1e055
--- /dev/null
+++ b/install/env_x86.txt
@@ -0,0 +1,8 @@
+conda-forge::gcc==14.2.0
+conda-forge::gxx_linux-64==14.2.0
+IPython==8.15.0
+sympy==1.13.2
+pyspark==3.4.1
+jinja2
+pytest
+coveralls
diff --git a/install_in.sh b/install/install.sh
similarity index 79%
rename from install_in.sh
rename to install/install.sh
index c9021c3..cbaf654 100755
--- a/install_in.sh
+++ b/install/install.sh
@@ -8,7 +8,14 @@ ENV_NAME=drudge_testing
 # Conda env creation
 echo "Creating Conda Environment"
 conda create --name $ENV_NAME python=3.9 -y
-conda install --name $ENV_NAME --file env.txt -y
+
+
+if [[ "$(uname -m)" == "x86_64" ]]; then
+    conda install --name $ENV_NAME --file env_x86.txt -y
+else
+    echo "CONDA ENVIRONMENT FOR arm64 NOT YET VERIFIED"
+    conda install --name $ENV_NAME --file env_arm.txt -y
+fi
 
 conda init
 conda activate $ENV_NAME
@@ -16,7 +23,7 @@ conda activate $ENV_NAME
 
 # Get Dummy Spark
 echo "Getting Dummy Spark"
-git clone https://github.com/DrudgeCAS/DummyRDD ./dummyRDD/
+git clone https://github.com/DrudgeCAS/DummyRDD ../dummyRDD/
 
 # Clone repository
 #echo "Cloning Repositories"
@@ -44,6 +51,7 @@ cp build/lib.linux-x86_64-cpython-39/drudge/canonpy.cpython-39-x86_64-linux-gnu.
 echo "Moving Dummy Spark"
 cp -r ../dummyRDD/dummy_spark .
 
+rm -rf ../dummyRDD/
 
 echo "DONE!!!"
 echo  'Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started with development simply type '\''code .'\'' and you'\''ll open a vscode window at this location'

From b6eec6f8430780d5f96ebb2672b30404462bb500 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 12:55:59 -0500
Subject: [PATCH 09/18] Professionalize the install script

---
 install/install.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/install/install.sh b/install/install.sh
index cbaf654..fcf9d33 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 # 
 #    INSTRUCTIONS:
+#      0) Check the ENV_NAME doesn't collide with previously defined environments
+#         - List current environments with `conda env list`
 #      1) Run this With `source install_in.sh`
 # 
-ENV_NAME=drudge_testing
+
+ENV_NAME=drudge
 
 # Conda env creation
 echo "Creating Conda Environment"
 conda create --name $ENV_NAME python=3.9 -y
 
-
+# Choose the correct conda package list
 if [[ "$(uname -m)" == "x86_64" ]]; then
     conda install --name $ENV_NAME --file env_x86.txt -y
 else
@@ -17,18 +20,14 @@ else
     conda install --name $ENV_NAME --file env_arm.txt -y
 fi
 
+# Force Conda into Base, then into created environment
+echo "Initializing Conda"
 conda init
 conda activate $ENV_NAME
 
 
-# Get Dummy Spark
-echo "Getting Dummy Spark"
-git clone https://github.com/DrudgeCAS/DummyRDD ../dummyRDD/
-
 # Clone repository
-#echo "Cloning Repositories"
-#git clone --recurse-submodules https://github.com/DrudgeCAS/drudge ./drudge/
-#cd drudge
+echo "Cloning Submodules"
 git submodule update --init --recursive
 
 
@@ -48,11 +47,15 @@ cp build/lib.linux-x86_64-cpython-39/drudge/wickcore.cpython-39-x86_64-linux-gnu
 cp build/lib.linux-x86_64-cpython-39/drudge/canonpy.cpython-39-x86_64-linux-gnu.so drudge/
 
 # Add Dummy Spark
+echo "Getting Dummy Spark"
+git clone https://github.com/DrudgeCAS/DummyRDD ../dummyRDD/
+
 echo "Moving Dummy Spark"
 cp -r ../dummyRDD/dummy_spark .
 
+# Remove unneeded folder
 rm -rf ../dummyRDD/
 
-echo "DONE!!!"
-echo  'Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started with development simply type '\''code .'\'' and you'\''ll open a vscode window at this location'
+echo "Installation Complete!"
+echo 'Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started with development simply type '\''code .'\'' and you'\''ll open a vscode window at this location'
 

From 1d67354c3a403f71ddbf7228895ddd155664fe2c Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 13:06:18 -0500
Subject: [PATCH 10/18] Readme Update

---
 README.rst | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 13d0de4..a15859d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
-.. image:: https://circleci.com/gh/tschijnmo/drudge.svg?style=shield
-    :target: https://circleci.com/gh/tschijnmo/drudge
+.. image:: https://circleci.com/gh/DrudgeCAS/drudge.svg?style=shield
+    :target: https://circleci.com/gh/DrudgeCAS/drudge
 
-.. image:: https://travis-ci.org/tschijnmo/drudge.svg?branch=master
-    :target: https://travis-ci.org/tschijnmo/drudge
+.. image:: https://travis-ci.org/DrudgeCAS/drudge.svg?branch=master
+    :target: https://travis-ci.org/DrudgeCAS/drudge
 
 .. image:: https://coveralls.io/repos/github/tschijnmo/drudge/badge.svg?branch=master
     :target: https://coveralls.io/github/tschijnmo/drudge?branch=master
@@ -58,6 +58,14 @@ with heavy dependence on tensor contraction and sums of tensor contractions,
 substantial optimization could be given.
 
 
+Documentation/Installation
+------
+Documentation Pages are located at the github pages `documentation`_ site. 
+Installation instructions can be seen at `installation`_.
+
+
+
+
 Drudge is developed by Jinmo Zhao and Prof Gustavo E Scuseria at Rice
 University, and was supported as part of the Center for the Computational Design
 of Functional Layered Materials, an Energy Frontier Research Center funded by
@@ -71,3 +79,5 @@ Award DE-SC0012575.
 .. _Clifford algebras: https://en.wikipedia.org/wiki/Clifford_algebra
 .. _su(2) algebra: https://en.m.wikipedia.org/wiki/Special_unitary_group#Lie_Algebra
 .. _gristmill: https://github.com/tschijnmo/gristmill
+.. _documentation: https://drudgecas.github.io/drudge/
+.. _installation: https://drudgecas.github.io/drudge/install.html

From 2e1483aebe86a7e60b781de661a73f8cbaab5962 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 13:48:50 -0500
Subject: [PATCH 11/18] Install.sh must be in the root directory, if it's
 anywhere else the complexity of dealing with where it's been run from is
 simply too much

---
 install/install.sh => install.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename install/install.sh => install.sh (100%)

diff --git a/install/install.sh b/install.sh
similarity index 100%
rename from install/install.sh
rename to install.sh

From e42a484b9cc15d57c5bfb0b8edf473c609afa4b6 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Wed, 14 May 2025 13:50:32 -0500
Subject: [PATCH 12/18] filepaths

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index fcf9d33..265eb30 100755
--- a/install.sh
+++ b/install.sh
@@ -14,10 +14,10 @@ conda create --name $ENV_NAME python=3.9 -y
 
 # Choose the correct conda package list
 if [[ "$(uname -m)" == "x86_64" ]]; then
-    conda install --name $ENV_NAME --file env_x86.txt -y
+    conda install --name $ENV_NAME --file install/env_x86.txt -y
 else
     echo "CONDA ENVIRONMENT FOR arm64 NOT YET VERIFIED"
-    conda install --name $ENV_NAME --file env_arm.txt -y
+    conda install --name $ENV_NAME --file install/env_arm.txt -y
 fi
 
 # Force Conda into Base, then into created environment

From 86e17d0e8046025a0047a2e0680a3bec725894ab Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 5 Jun 2025 18:29:02 -0500
Subject: [PATCH 13/18] possible fix for conda issues. Conda says 'killed' when
 attempting to installfrom environment file. I think this is some kind of
 memory overrun or something, separating every install out into single lines
 works on a fresh conda install. We'll see if it works generally

---
 install.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 265eb30..9b59c28 100755
--- a/install.sh
+++ b/install.sh
@@ -11,15 +11,25 @@ ENV_NAME=drudge
 # Conda env creation
 echo "Creating Conda Environment"
 conda create --name $ENV_NAME python=3.9 -y
+conda activate $ENV_NAME
 
 # Choose the correct conda package list
 if [[ "$(uname -m)" == "x86_64" ]]; then
-    conda install --name $ENV_NAME --file install/env_x86.txt -y
+    # conda install --name $ENV_NAME --file install/env_x86.txt -y
+    conda install conda-forge::gcc==14.2.0 -y
+    conda install conda-forge::gxx_linux-64==14.2.0 -y
 else
-    echo "CONDA ENVIRONMENT FOR arm64 NOT YET VERIFIED"
-    conda install --name $ENV_NAME --file install/env_arm.txt -y
+    # echo "CONDA ENVIRONMENT FOR arm64 NOT YET VERIFIED"
+    # conda install --name $ENV_NAME --file install/env_arm.txt -y
 fi
 
+conda install IPython==8.15.0 -y
+conda install sympy==1.13.2 -y
+conda install pyspark==3.4.1 -y
+conda install jinja2 -y 
+conda install pytest -y
+conda install coveralls -y
+
 # Force Conda into Base, then into created environment
 echo "Initializing Conda"
 conda init

From cc5684f760584d3d939c45f1f50becbbfabaa7ca Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 5 Jun 2025 18:30:01 -0500
Subject: [PATCH 14/18] add upgrade command to ensure latest conda

---
 install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install.sh b/install.sh
index 9b59c28..1468cb9 100755
--- a/install.sh
+++ b/install.sh
@@ -8,6 +8,9 @@
 
 ENV_NAME=drudge
 
+# Ensure latest conda installed 
+conda update -n base -c defaults conda
+
 # Conda env creation
 echo "Creating Conda Environment"
 conda create --name $ENV_NAME python=3.9 -y

From cc3b15d752bbea9e14193efdc00c46058f68abb6 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 5 Jun 2025 18:32:48 -0500
Subject: [PATCH 15/18] bash syntax error

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index 1468cb9..46ba51b 100755
--- a/install.sh
+++ b/install.sh
@@ -24,6 +24,7 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
 else
     # echo "CONDA ENVIRONMENT FOR arm64 NOT YET VERIFIED"
     # conda install --name $ENV_NAME --file install/env_arm.txt -y
+    echo ""
 fi
 
 conda install IPython==8.15.0 -y

From ecb197b7cb116f1ea0f92fef9cea651072d6e624 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 5 Jun 2025 18:51:54 -0500
Subject: [PATCH 16/18] Altered final comment in bash script to match updated
 guidance for running program

---
 install.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 46ba51b..0ddd5db 100755
--- a/install.sh
+++ b/install.sh
@@ -56,9 +56,9 @@ python3 setup.py build
 python3 setup.py install
 
 # Copy the cpp files where needed
-echo "Moving cpp files"
-cp build/lib.linux-x86_64-cpython-39/drudge/wickcore.cpython-39-x86_64-linux-gnu.so drudge/
-cp build/lib.linux-x86_64-cpython-39/drudge/canonpy.cpython-39-x86_64-linux-gnu.so drudge/
+# echo "Moving cpp files"
+# cp build/lib.linux-x86_64-cpython-39/drudge/wickcore.cpython-39-x86_64-linux-gnu.so drudge/
+# cp build/lib.linux-x86_64-cpython-39/drudge/canonpy.cpython-39-x86_64-linux-gnu.so drudge/
 
 # Add Dummy Spark
 echo "Getting Dummy Spark"
@@ -71,5 +71,9 @@ cp -r ../dummyRDD/dummy_spark .
 rm -rf ../dummyRDD/
 
 echo "Installation Complete!"
-echo 'Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started with development simply type '\''code .'\'' and you'\''ll open a vscode window at this location'
-
+echo "Assuming you ran this with '\''source'\'' you'\''re now inside the drudge folder. To get started using drudge you'll want to do 3 things after opening your chosen IDE to your code location:"
+echo "   1) Ensure your Python Interpreter is set to the Conda Environment Python we just created"
+echo "   2) Ensure this conda environment is activated with '\''conda activate drudge '\'' in the terminal which runs your program"
+echo "   3) Set your pythonpath to the build directory of this repository like '\''export PYTHONPATH=\$PYTHONPATH:/path/to/drudge/build'\''"
+echo " "
+echo "Have Fun!"

From c6c1b372da8f199f2d8942f194ee3d2306d5428d Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Thu, 5 Jun 2025 21:44:08 -0500
Subject: [PATCH 17/18] Submoduled Dummyspark

---
 .gitmodules   | 3 +++
 deps/DummyRDD | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 deps/DummyRDD

diff --git a/.gitmodules b/.gitmodules
index 73ec8d2..f5ad008 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "deps/libcanon"]
 	path = deps/libcanon
 	url = https://github.com/tschijnmo/libcanon.git
+[submodule "deps/DummyRDD"]
+	path = deps/DummyRDD
+	url = https://github.com/DrudgeCAS/DummyRDD
diff --git a/deps/DummyRDD b/deps/DummyRDD
new file mode 160000
index 0000000..0089341
--- /dev/null
+++ b/deps/DummyRDD
@@ -0,0 +1 @@
+Subproject commit 00893412e5c52bde2dfa5457500db0d8f8616202

From 021c3e5a265fed58dcd50329f469b65da474f769 Mon Sep 17 00:00:00 2001
From: Matthew Wholey <15wholeym@gmail.com>
Date: Fri, 6 Jun 2025 14:50:40 -0500
Subject: [PATCH 18/18] -yes

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 0ddd5db..bfba7e3 100755
--- a/install.sh
+++ b/install.sh
@@ -9,7 +9,7 @@
 ENV_NAME=drudge
 
 # Ensure latest conda installed 
-conda update -n base -c defaults conda
+conda update -n base -c defaults conda -y
 
 # Conda env creation
 echo "Creating Conda Environment"