Updated scripts.

python/pyxet/scripts/build_wheel.sh

@@ -11,28 +11,19 @@ fi
 export MACOSX_DEPLOYMENT_TARGET=10.9
 unset CONDA_PREFIX
 
-# Clear out the old virtual env.
-rm -rf .venv_build
-
-OS=$(uname -s)
+python_executable=$(./scripts/find_python.sh release)
 
-if [[ -z "$PYTHON_EXECUTABLE" ]] ; then 
-    if [[ "$OS" == "Darwin" ]]; then
-        # Use system universal one
-        PYTHON_EXECUTABLE=/usr/bin/python3
-    else 
-        PYTHON_EXECUTABLE=$(which python3)
-    fi
-fi
-
-$PYTHON_EXECUTABLE -m venv .venv_build
+# Clear out and rebuild the virtual env 
+rm -rf .venv_build
+$python_executable -m venv .venv_build
 . .venv_build/bin/activate
 
 pip install --upgrade pip
 pip install -r scripts/dev_requirements.txt
 
 # Clear out any old wheels
-mv target/wheels/ target/old_wheels/ || echo ""
+mkdir -p target/old_wheels/
+mv target/wheels/* target/old_wheels/ || echo ""
 
 if [[ "$OS" == "Darwin" ]]; then
     maturin build --profile=cli-release --target=universal2-apple-darwin 

python/pyxet/scripts/find_python.sh

@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+# To be sourced.  Sets PYTHON_EXECUTABLE
+
+OS=$(uname -s)
+
+if [[ "$1" == "release" ]] ; then 
+
+    # In release mode, use the universal python executable on osx that ships with the system. However, 
+    # this doesn't allow debugging, so don't do it for non-release mode
+    if [[ "$OS" == "Darwin" ]]; then
+        # Use system universal one
+        echo "/usr/bin/python3"
+    else
+        if [[ "$(python --version)" == "Python 3"* ]] ; then
+            echo "$(which python)"
+        elif [[ "$(python3 --version)" == "Python 3"* ]] ; then
+            echo "$(which python3)"
+        else
+            >&2 echo "Unable to find appropriate python version."
+            exit 1
+        fi
+    fi
+else
+    if [[ ! -z $PYTHON_EXECUTABLE ]] ; then 
+        echo "$PYTHON_EXECUTABLE"
+    elif [[ "$(python --version)" == "Python 3"* ]] ; then
+        echo "$(which python)"
+    elif [[ "$(python3 --version)" == "Python 3"* ]] ; then
+        echo "$(which python3)"
+    else
+        >&2 echo "Unable to find appropriate python version."
+        exit 1
+    fi
+
+fi

python/pyxet/scripts/setup_env.sh

@@ -2,7 +2,7 @@
 
 if [[ -z "$VIRTUAL_ENV" ]] ; then 
 
-    source ./scripts/set_python_executable.sh
+    python_executable=$(./scripts/find_python.sh)
 
     if [[ ! -e pyproject.toml ]] ; then 
         echo "Run this script in the pyxet directory using ./scripts/$0"
@@ -11,8 +11,8 @@ if [[ -z "$VIRTUAL_ENV" ]] ; then
 
     if [[ ! -e venv/ ]] ; then 
         echo "Setting up virtual environment."
-        echo "Python version = $($PYTHON_EXECUTABLE --version)"
-        $PYTHON_EXECUTABLE -m venv ./venv
+        echo "Python version = $($python_executable--version)"
+        $python_executable -m venv ./venv
 
         source ./venv/bin/activate || ls -R ./