From 9307536827bd44d7318cb42b2e873ce5dcca598d Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Sun, 25 Aug 2024 13:49:43 -0700 Subject: [PATCH] Add venv on Mac and do not use --user flag in that case --- .github/workflows/build-python.yml | 10 +++++++++- python/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index ed1b4cbdb..cb465309e 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -168,9 +168,17 @@ jobs: run: | bash .github/scripts/python.sh -d + - name: Create virtual on MacOS + if: runner.os == 'macOS' + run: | + python$PYTHON_VERSION -m venv venv + source venv/bin/activate + echo "PATH=$(pwd)/venv/bin:$PATH" >> $GITHUB_ENV + python -m pip install --upgrade pip + - name: Install Python Dependencies shell: bash - run: python$PYTHON_VERSION -m pip install --break-system-packages --user -r python/dev_requirements.txt + run: python$PYTHON_VERSION -m pip install -r python/dev_requirements.txt - name: Build shell: bash diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 8fd092e8d..e13103839 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -266,7 +266,7 @@ endif() # Add custom target so we can install with `make python-install` set(GTSAM_PYTHON_INSTALL_TARGET python-install) add_custom_target(${GTSAM_PYTHON_INSTALL_TARGET} - COMMAND ${PYTHON_EXECUTABLE} -m pip install --break-system-packages --user . + COMMAND ${PYTHON_EXECUTABLE} -m pip install $(if [ -z "$VIRTUAL_ENV" ]; then echo "--user"; fi) . DEPENDS ${GTSAM_PYTHON_DEPENDENCIES} WORKING_DIRECTORY ${GTSAM_PYTHON_BUILD_DIRECTORY})