Skip to content

♻️ Fix e2e to use pypi #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 22, 2024
Merged

♻️ Fix e2e to use pypi #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4567ac
add bash script to resolve osparc package version
bisgaard-itis Oct 22, 2024
df0483f
add precommit
bisgaard-itis Oct 22, 2024
cc4a162
start improving make recipe for installing test tools
bisgaard-itis Oct 22, 2024
69d97ff
fix install
bisgaard-itis Oct 22, 2024
0af36e8
delete previous script
bisgaard-itis Oct 22, 2024
6ce9a09
cosmetic change
bisgaard-itis Oct 22, 2024
d1c8f97
minor change
bisgaard-itis Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions clients/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions clients/python/test/e2e/ci/bash/install_osparc_python_client.bash
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions clients/python/test/e2e/ci/bash/osparc_version.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Loading