Release with latest versions, cache test venv

release.sh

@@ -60,14 +60,14 @@ rm -rf metastore_db/ spark-warehouse/
 ./set-version.sh 3.1.3 2.12.10; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
 ./set-version.sh 3.2.4 2.12.15; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
 ./set-version.sh 3.3.4 2.12.15; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
-./set-version.sh 3.4.2 2.12.17; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
-./set-version.sh 3.5.0 2.12.18; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
+./set-version.sh 3.4.3 2.12.17; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
+./set-version.sh 3.5.1 2.12.18; mvn clean deploy -Dsign; ./build-whl.sh; ./test-release.sh
 rm -rf python/dist
 
 ./set-version.sh 3.2.4 2.13.5; mvn clean deploy -Dsign; ./test-release.sh
 ./set-version.sh 3.3.4 2.13.8; mvn clean deploy -Dsign; ./test-release.sh
-./set-version.sh 3.4.2 2.13.8; mvn clean deploy -Dsign; ./test-release.sh
-./set-version.sh 3.5.0 2.13.8; mvn clean deploy -Dsign; ./test-release.sh
+./set-version.sh 3.4.3 2.13.8; mvn clean deploy -Dsign; ./test-release.sh
+./set-version.sh 3.5.1 2.13.8; mvn clean deploy -Dsign; ./test-release.sh
 rm -rf metastore_db/ spark-warehouse/
 
 # all SNAPSHOT versions build, test and complete the example, releasing
@@ -109,13 +109,13 @@ mkdir -p python/pyspark/jars/
 ./set-version.sh 3.1.3 2.12.10; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
 ./set-version.sh 3.2.4 2.12.15; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
 ./set-version.sh 3.3.4 2.12.15; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
-./set-version.sh 3.4.2 2.12.17; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
-./set-version.sh 3.5.0 2.12.18; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
+./set-version.sh 3.4.3 2.12.17; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
+./set-version.sh 3.5.1 2.12.18; mvn clean deploy -Dsign; mvn nexus-staging:release; ./build-whl.sh
 
 ./set-version.sh 3.2.4 2.13.5; mvn clean deploy -Dsign; mvn nexus-staging:release
 ./set-version.sh 3.3.4 2.13.8; mvn clean deploy -Dsign; mvn nexus-staging:release
-./set-version.sh 3.4.2 2.13.8; mvn clean deploy -Dsign; mvn nexus-staging:release
-./set-version.sh 3.5.0 2.13.8; mvn clean deploy -Dsign; mvn nexus-staging:release
+./set-version.sh 3.4.3 2.13.8; mvn clean deploy -Dsign; mvn nexus-staging:release
+./set-version.sh 3.5.1 2.13.8; mvn clean deploy -Dsign; mvn nexus-staging:release
 
 # upload to test PyPi
 pip install twine

test-release.sh

@@ -52,9 +52,11 @@ spark-$spark-$scala_compat/bin/spark-submit --packages uk.co.gresearch.spark:spa
 if [ "$scala_compat" == "2.12" ]
 then
     echo "Testing Python with whl package"
-    if [ -e "venv" ]; then rm -rf venv; fi
-    virtualenv -p python3.10 venv
-    source venv/bin/activate
+    if [ ! -e "venv-$spark" ]
+    then
+      virtualenv -p python3.10 venv-$spark
+    fi
+    source venv-$spark/bin/activate
     pip install -r python/requirements-${spark_compat}_$scala_compat.txt
     pip install python/dist/pyspark_extension-${version/-*/}.$spark_compat${version/*-SNAPSHOT/.dev0}-py3-none-any.whl
     python3 test-release.py