merge itis/master into master

Author: bisgaard-itis

.pre-commit-config.yaml

@@ -13,6 +13,8 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
   - repo: https://github.com/roy-ht/pre-commit-jupyter
     rev: v1.2.1
     hooks:

clients/python/Makefile

@@ -125,8 +125,9 @@ install-unit-test: _check_venv_active ## install packages for unit testing clien
 	uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/unit-test.txt
 
 .PHONY: install-e2e-test
-install-e2e-test: _check_venv_active ## install packages for e2e testing client [e2e]
-	uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/e2e-test.txt
+install-e2e-test: _check_venv_active guard-OSPARC_VERSION ## install packages for e2e testing client [e2e]
+	$(eval version := $(shell bash $(CLIENTS_PYTHON_DIR)/test/e2e/ci/bash/osparc_version.bash $(OSPARC_VERSION)))
+	uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/e2e-test.txt osparc==$(version)
 
 .PHONY: install-doc
 install-doc: _check_venv_active .install-dev-reqs ## install packages for generating documentation

clients/python/test/e2e/ci/bash/install_osparc_python_client.bash

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -o errexit  # abort on nonzero exitstatus
+set -o nounset  # abort on unbound variable
+set -o pipefail # don't hide errors within pipes
+
+version=$1
+report=$(mktemp)
+trap 'rm -rf ${report}' ERR
+
+if [ "${version}" == "latest_release" ]; then
+    pip install osparc --force-reinstall --dry-run --quiet --report "${report}"
+elif [ "${version}" == "latest_master" ]; then
+    pip install osparc --pre --force-reinstall --dry-run --quiet --report "${report}"
+else
+    pip install osparc=="${version}" --force-reinstall --dry-run --quiet --report "${report}"
+fi
+jq -r '.install[] | select(.metadata.name == "osparc") | .metadata.version' "${report}"
+rm -rf "${report}"