Skip to content

Commit 1962fef

Browse files
♻️ Fix e2e to use pypi (#197)
1 parent 4a33df8 commit 1962fef

File tree

4 files changed

+24
-38
lines changed

4 files changed

+24
-38
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ repos:
1313
- id: detect-private-key
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
16+
- id: check-executables-have-shebangs
17+
- id: check-shebang-scripts-are-executable
1618
- repo: https://github.com/roy-ht/pre-commit-jupyter
1719
rev: v1.2.1
1820
hooks:

clients/python/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ install-unit-test: _check_venv_active ## install packages for unit testing clien
125125
uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/unit-test.txt
126126

127127
.PHONY: install-e2e-test
128-
install-e2e-test: _check_venv_active ## install packages for e2e testing client [e2e]
129-
uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/e2e-test.txt
128+
install-e2e-test: _check_venv_active guard-OSPARC_VERSION ## install packages for e2e testing client [e2e]
129+
$(eval version := $(shell bash $(CLIENTS_PYTHON_DIR)/test/e2e/ci/bash/osparc_version.bash $(OSPARC_VERSION)))
130+
uv pip install -r $(CLIENTS_PYTHON_DIR)/requirements/e2e-test.txt osparc==$(version)
130131

131132
.PHONY: install-doc
132133
install-doc: _check_venv_active .install-dev-reqs ## install packages for generating documentation

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

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
set -o errexit # abort on nonzero exitstatus
4+
set -o nounset # abort on unbound variable
5+
set -o pipefail # don't hide errors within pipes
6+
7+
version=$1
8+
report=$(mktemp)
9+
trap 'rm -rf ${report}' ERR
10+
11+
if [ "${version}" == "latest_release" ]; then
12+
pip install osparc --force-reinstall --dry-run --quiet --report "${report}"
13+
elif [ "${version}" == "latest_master" ]; then
14+
pip install osparc --pre --force-reinstall --dry-run --quiet --report "${report}"
15+
else
16+
pip install osparc=="${version}" --force-reinstall --dry-run --quiet --report "${report}"
17+
fi
18+
jq -r '.install[] | select(.metadata.name == "osparc") | .metadata.version' "${report}"
19+
rm -rf "${report}"

0 commit comments

Comments
 (0)