From f595c463f3e3f54570627c4d18ab9a57335bec67 Mon Sep 17 00:00:00 2001 From: Roman Bredehoft Date: Fri, 7 Jun 2024 16:30:49 +0200 Subject: [PATCH] chore: fix wheel install in weekly CI --- Makefile | 6 +++--- script/make_utils/check_installation_with_all_python.sh | 2 +- script/make_utils/pytest_pypi_cml.sh | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3f1938363..42e64715b 100644 --- a/Makefile +++ b/Makefile @@ -518,7 +518,7 @@ pytest_codeblocks: .PHONY: pytest_codeblocks_pypi_wheel_cml # Test code blocks using the PyPI local wheel of Concrete ML pytest_codeblocks_pypi_wheel_cml: - ./script/make_utils/pytest_pypi_cml.sh --wheel "$(CONCRETE_PYTHON_VERSION)" --codeblocks + ./script/make_utils/pytest_pypi_cml.sh --wheel --codeblocks .PHONY: pytest_codeblocks_pypi_cml # Test code blocks using PyPI Concrete ML pytest_codeblocks_pypi_cml: @@ -761,11 +761,11 @@ check_unused_images: .PHONY: pytest_pypi_wheel_cml # Run tests using PyPI local wheel of Concrete ML pytest_pypi_wheel_cml: - ./script/make_utils/pytest_pypi_cml.sh --wheel "$(CONCRETE_PYTHON_VERSION)" + ./script/make_utils/pytest_pypi_cml.sh --wheel .PHONY: pytest_pypi_wheel_cml_no_flaky # Run tests (except flaky ones) using PyPI local wheel of Concrete ML pytest_pypi_wheel_cml_no_flaky: - ./script/make_utils/pytest_pypi_cml.sh --wheel "$(CONCRETE_PYTHON_VERSION)" --noflaky + ./script/make_utils/pytest_pypi_cml.sh --wheel --noflaky .PHONY: pytest_pypi_cml # Run tests using PyPI Concrete ML pytest_pypi_cml: diff --git a/script/make_utils/check_installation_with_all_python.sh b/script/make_utils/check_installation_with_all_python.sh index 6a22f0d71..268f651c0 100755 --- a/script/make_utils/check_installation_with_all_python.sh +++ b/script/make_utils/check_installation_with_all_python.sh @@ -75,7 +75,7 @@ do # Install the dependencies as PyPI would do using the wheel file PYPI_WHEEL=$(find dist -type f -name "*.whl") - python -m pip install "${PYPI_WHEEL}" + python -m pip install --extra-index-url https://pypi.zama.ai "${PYPI_WHEEL}" elif [ "$METHOD" == "pip" ] then diff --git a/script/make_utils/pytest_pypi_cml.sh b/script/make_utils/pytest_pypi_cml.sh index da9d63112..9e68d7fec 100755 --- a/script/make_utils/pytest_pypi_cml.sh +++ b/script/make_utils/pytest_pypi_cml.sh @@ -12,8 +12,6 @@ do case "$1" in "--wheel" ) USE_PIP_WHEEL='true' - shift - CONCRETE_PYTHON="$1" ;; "--codeblocks" ) @@ -68,8 +66,7 @@ if ${USE_PIP_WHEEL}; then # Install the dependencies as PyPI would do using the wheel file as well as the given # Concrete-Python version PYPI_WHEEL=$(find dist -type f -name "*.whl") - python -m pip install "${PYPI_WHEEL}" - python -m pip install --extra-index-url https://pypi.zama.ai "${CONCRETE_PYTHON}" + python -m pip install --extra-index-url https://pypi.zama.ai "${PYPI_WHEEL}" else if [ -z "${VERSION}" ]; then python -m pip install concrete-ml