From d7c5e9f77558422ee0ecbb9fe3a602afb2a97046 Mon Sep 17 00:00:00 2001
From: Samuel Johnson <sfjohnson24@gmail.com>
Date: Wed, 10 Jun 2026 12:07:32 -0400
Subject: [PATCH 1/4] merge main

---
 Published/CORE-000084/negative/02/results/results.csv | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Published/CORE-000084/negative/02/results/results.csv b/Published/CORE-000084/negative/02/results/results.csv
index ac0a344f7..daf1aa5b6 100644
--- a/Published/CORE-000084/negative/02/results/results.csv
+++ b/Published/CORE-000084/negative/02/results/results.csv
@@ -1,14 +1,6 @@
 Dataset,Record,Variable,Value
-<<<<<<< HEAD
-AE,0,AEENTPT,2013-05-20
-AE,1,AEENTPT,2013-05-20
-AE,2,AEENTPT,2013-01-14
-AE,3,AEENTPT,2013-01-14
-AE,4,AEENTPT,
-=======
 AE.csv,1,AEENTPT,2013-05-20
 AE.csv,2,AEENTPT,2013-05-20
 AE.csv,3,AEENTPT,2013-01-14
 AE.csv,4,AEENTPT,2013-01-14
 AE.csv,5,AEENTPT,
->>>>>>> main

From 4864625195da611aaba9ae3cfc20b9c9bea85172 Mon Sep 17 00:00:00 2001
From: Samuel Johnson <sfjohnson24@gmail.com>
Date: Mon, 15 Jun 2026 13:35:27 -0400
Subject: [PATCH 2/4] move from requirement.txt

---
 .../workflows/validate-rule-contributions.yml |  2 +-
 setup/bash_setup.sh                           |  9 ++-----
 setup/windows_setup.bat                       | 24 +------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/validate-rule-contributions.yml b/.github/workflows/validate-rule-contributions.yml
index 0fdb43540..cfb647d1d 100644
--- a/.github/workflows/validate-rule-contributions.yml
+++ b/.github/workflows/validate-rule-contributions.yml
@@ -34,7 +34,7 @@ jobs:
           python -m venv venv
           git submodule update --init --recursive
           ./venv/bin/pip install --upgrade pip
-          ./venv/bin/pip install -r engine/requirements.txt
+          ./venv/bin/pip install -e engine/
 
       # -----------------------------------------------------------------------
       # Detect which rule changed
diff --git a/setup/bash_setup.sh b/setup/bash_setup.sh
index c69282c30..6fa96a66d 100644
--- a/setup/bash_setup.sh
+++ b/setup/bash_setup.sh
@@ -134,13 +134,8 @@ source venv/bin/activate
 echo "Installing dependencies..."
 pip install --upgrade pip --quiet
 
-if [ "$INSTALL_BINARY" = true ]; then
-    echo "Installing with psycopg2-binary swap..."
-    sed 's/^psycopg2==/psycopg2-binary==/g' engine/requirements.txt | pip install --quiet -r /dev/stdin
-    grep -v "^-r requirements.txt" engine/requirements-dev.txt | pip install --quiet -r /dev/stdin
-else
-    echo "Installing standard requirements..."
-    pip install -r engine/requirements-dev.txt --quiet
+echo "Installing standard requirements..."
+pip install --quiet -e engine/[dev]
 fi
 
 VENV_PYTHON=$(which python)
diff --git a/setup/windows_setup.bat b/setup/windows_setup.bat
index 77d0ce5be..9f3eb1278 100644
--- a/setup/windows_setup.bat
+++ b/setup/windows_setup.bat
@@ -147,29 +147,7 @@ echo.
 echo Installing dependencies...
 python -m pip install --upgrade pip setuptools wheel --quiet
 
-if not exist "engine/requirements.txt" (
-    echo requirements.txt not found in engine directory
-    cd ..
-    pause
-    exit /b 1
-)
-
-python -m pip install -r engine/requirements.txt --quiet
-if !errorlevel! neq 0 (
-    echo Failed to install dependencies
-    cd ..
-    pause
-    exit /b 1
-)
-
-if not exist "engine/requirements-dev.txt" (
-    echo requirements-dev.txt not found in engine directory
-    cd ..
-    pause
-    exit /b 1
-)
-
-python -m pip install -r engine/requirements-dev.txt --quiet
+python -m pip install -e engine/ --quiet
 if !errorlevel! neq 0 (
     echo Failed to install dependencies
     cd ..

From 2bb98e40668b9032202a88f8dd886e78f5dffdfe Mon Sep 17 00:00:00 2001
From: Samuel Johnson <sfjohnson24@gmail.com>
Date: Mon, 15 Jun 2026 14:43:58 -0400
Subject: [PATCH 3/4] remove fi

---
 setup/bash_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/bash_setup.sh b/setup/bash_setup.sh
index 6fa96a66d..3f003bff1 100644
--- a/setup/bash_setup.sh
+++ b/setup/bash_setup.sh
@@ -136,7 +136,7 @@ pip install --upgrade pip --quiet
 
 echo "Installing standard requirements..."
 pip install --quiet -e engine/[dev]
-fi
+
 
 VENV_PYTHON=$(which python)
 

From 00ce4c314d8b2291f25a42c78563da9239b25cdc Mon Sep 17 00:00:00 2001
From: Samuel Johnson <sfjohnson24@gmail.com>
Date: Mon, 15 Jun 2026 15:14:26 -0400
Subject: [PATCH 4/4] dev environemtn

---
 setup/bash_setup.sh     | 11 -----------
 setup/windows_setup.bat |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/setup/bash_setup.sh b/setup/bash_setup.sh
index 3f003bff1..3b420ebc8 100644
--- a/setup/bash_setup.sh
+++ b/setup/bash_setup.sh
@@ -2,17 +2,6 @@
 # Contributor setup script for Mac/Linux
 set -e
 
-INSTALL_BINARY=false
-
-# Parse flags to set INSTALL_BINARY=true if -b or --binary passed
-while [[ "$#" -gt 0 ]]; do
-    case $1 in
-        -b|--binary) INSTALL_BINARY=true ;;
-        *) echo "Unknown parameter passed: $1"; exit 1 ;;
-    esac
-    shift
-done
-
 command_exists() {
     command -v "$1" >/dev/null 2>&1
 }
diff --git a/setup/windows_setup.bat b/setup/windows_setup.bat
index 9f3eb1278..4348441f9 100644
--- a/setup/windows_setup.bat
+++ b/setup/windows_setup.bat
@@ -147,7 +147,7 @@ echo.
 echo Installing dependencies...
 python -m pip install --upgrade pip setuptools wheel --quiet
 
-python -m pip install -e engine/ --quiet
+python -m pip install -e engine/[dev] --quiet
 if !errorlevel! neq 0 (
     echo Failed to install dependencies
     cd ..