Refactor setup scripts: remove deprecated pycache cleanup, reorganize…

… virtual environment setup, and streamline dependency installation
arthur-debert · Dec 9, 2024 · d1e3db3 · d1e3db3
1 parent 8aee756
commit d1e3db3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,6 @@ classifiers = [
 urls = { "Homepage" = "https://github.com/arthur-debert/rangy" }
 
 dependencies = [
-    "dateutils==0.6.12",
     "toml>=0.10.2",
 ]
 

diff --git a/scripts/close-gflow → scripts/prflow/close-gflow b/scripts/close-gflow → scripts/prflow/close-gflow
diff --git a/scripts/create-gflow → scripts/prflow/create-gflow b/scripts/create-gflow → scripts/prflow/create-gflow
diff --git a/scripts/gitprflow.sh → scripts/prflow/gitprflow.sh b/scripts/gitprflow.sh → scripts/prflow/gitprflow.sh
diff --git a/scripts/py-remove-pycache b/scripts/py-remove-pycache
diff --git a/scripts/setup::all b/scripts/setup::all
@@ -0,0 +1,10 @@
+#! /usr/bin/env bash
+
+# calls the setup::venv and setup::requirements scripts
+
+script_dir=$(dirname "$0")
+"$script_dir/setup::venv" || exit 1
+"$script_dir/setup::deps"
+
+source .venv/bin/activate || { echo "Virtual environment activation failed!"; exit 1; }
+"$@"  # Execute any command passed as arguments
diff --git a/scripts/setup → scripts/setup::deps b/scripts/setup → scripts/setup::deps
@@ -1,6 +1,6 @@
 if [ ! -d .venv ]; then
-    echo "Creating virtual environment .venv"
-    python3 -m venv .venv
+    echo "Venv should be created, see setup::venv.sh"
+    exit 1
 
 fi
 source .venv/bin/activate &&\

diff --git a/scripts/setup::venv b/scripts/setup::venv
@@ -0,0 +1,5 @@
+if [ ! -d .venv ]; then
+    echo "Creating virtual environment .venv"
+    python3 -m venv .venv
+
+fi