From f8b26ea3d18c02de991b4da51657ebffd83a1a35 Mon Sep 17 00:00:00 2001
From: salty <salty@salty.dk>
Date: Tue, 9 Apr 2024 20:11:24 +0200
Subject: [PATCH] use requirements-saltbox.txt for pip depdendencies

---
 sb.py     | 6 ------
 sb_dep.sh | 8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/sb.py b/sb.py
index 6f00e60..c50089e 100644
--- a/sb.py
+++ b/sb.py
@@ -617,12 +617,6 @@ def manage_ansible_venv(recreate=False):
         print("Update script failed.")
         sys.exit(result.returncode)
 
-    # Install pip and required packages
-    subprocess.run([f"{ansible_venv_path}/venv/bin/pip", "install", "-U", "pip"])
-    required_packages = ["tld", "argon2_cffi", "ndg-httpsclient", "dnspython", "lxml", "jmespath", "passlib", "PyMySQL",
-                         "docker", "pyOpenSSL", "requests", "netaddr", "jinja2"]
-    subprocess.run([f"{ansible_venv_path}/venv/bin/pip", "install"] + required_packages)
-
     # Change ownership of the ansible directory
     subprocess.run(["chown", "-R", f"{SALTBOX_USER}:{SALTBOX_USER}", ansible_venv_path])
 
diff --git a/sb_dep.sh b/sb_dep.sh
index cf3e40f..7afba20 100644
--- a/sb_dep.sh
+++ b/sb_dep.sh
@@ -122,7 +122,6 @@ run_cmd apt-get install -y \
     python3-dev \
     python3-testresources \
     python3-apt \
-    python3-virtualenv \
     python3-venv \
     || error "Failed to install apt dependencies"
 
@@ -195,12 +194,7 @@ run_cmd $PYTHON3_CMD \
     pip setuptools wheel \
     || error "Failed to install pip setuptools and wheel with $PYTHON3_CMD"
 run_cmd $PYTHON3_CMD \
-    pyOpenSSL requests netaddr \
-    jmespath jinja2 docker \
-    ruamel.yaml tld argon2_cffi \
-    ndg-httpsclient dnspython lxml \
-    jmespath passlib PyMySQL \
-    ansible$ANSIBLE ansible-lint \
+    --requirements /srv/git/sb/requirements-saltbox.txt \
     || error "Failed to install pip3 dependencies with $PYTHON3_CMD"
 
 run_cmd cp /srv/ansible/venv/bin/ansible* /usr/local/bin/ \