Skip to content

[srock] Activate venv in both setup & build #2261

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
dpalermo merged 2 commits into from
Jun 15, 2026
Merged

[srock] Activate venv in both setup & build #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d075a92
[srock] Activate venv in both setup & build
dpalermo Jun 15, 2026
001073c
Fix shellcheck warnings
dpalermo Jun 15, 2026
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 srock-bin/build_srock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ if [ ! -d "$SROCK_THEROCK_DIR" ] ; then
exit 1
fi

srock_venv_activate

# Print the start banner similar to DONE banner, useful if fails
echo
echo "===== START $0 on $_start_date"
Expand Down
18 changes: 1 addition & 17 deletions srock-bin/setup_srock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,7 @@ fi

cd "$SROCK_THEROCK_DIR" || exit

if [ -d "$SROCK_THEROCK_DIR/.venv/bin" ] ; then
echo
echo "===== Activating virtual environment ====="
cd "$SROCK_THEROCK_DIR" || exit
echo "source .venv/bin/activate"
source ".venv/bin/activate"
else
echo
echo "===== Building virtual environment in .venv and updating PATH ====="
cd "$SROCK_THEROCK_DIR" || exit
echo "python3 -m venv .venv && source .venv/bin/activate"
# shellcheck disable=1091
python3 -m venv .venv && source ".venv/bin/activate"
fi
echo "pip install -r requirements.txt"
pip install -r requirements.txt
export PATH=$SROCK_THEROCK_DIR/.venv/bin:$PATH
srock_venv_activate

if [ "$ARG" != "restart" ]; then
echo
Expand Down
21 changes: 21 additions & 0 deletions srock-bin/srock_common_vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,27 @@ function test_apply_patch() {
fi
}

function srock_venv_activate() {
if [ -d "$SROCK_THEROCK_DIR/.venv/bin" ] ; then
echo
echo "===== Activating virtual environment ====="
cd "$SROCK_THEROCK_DIR" || exit
echo "source .venv/bin/activate"
# shellcheck disable=1091 # don't analyze activate
source ".venv/bin/activate"
else
echo
echo "===== Building virtual environment in .venv and updating PATH ====="
cd "$SROCK_THEROCK_DIR" || exit
echo "python3 -m venv .venv && source .venv/bin/activate"
# shellcheck disable=1091 # don't analyze activate
python3 -m venv .venv && source ".venv/bin/activate"
fi
echo "pip install -r requirements.txt"
pip install -r requirements.txt
export PATH=$SROCK_THEROCK_DIR/.venv/bin:$PATH
}

SROCK="NEVER_USE_'\$SROCK'_ENV_VARIABLE" # Use SROCK_LINK

# SROCK_REPOS is the parent directory for TheRock and srock repos.
Expand Down
Loading