Skip to content

ci: fix python version used in mac virtual env #13472

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

Closed
instagrim-dev wants to merge 4 commits into from
Closed

ci: fix python version used in mac virtual env #13472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
596cc7c
ci: pin python for mac virtualenv
instagrim-dev Oct 9, 2020
c9e4e55
debugging mac bash scripts
instagrim-dev Oct 9, 2020
f31baf4
debugging mac bash scripts (2nd)
instagrim-dev Oct 10, 2020
00fdb34
debug process_xml_mac script
instagrim-dev Oct 10, 2020
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
6 changes: 4 additions & 2 deletions ci/flaky_test/run_process_xml_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash

pip3 install slackclient
./ci/flaky_test/process_xml.py
# shellcheck source=tools/shell_utils.sh
. "${ENVOY_SRCDIR}"/tools/shell_utils.sh

python_venv process_xml "$1"
2 changes: 0 additions & 2 deletions ci/mac_ci_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,3 @@ if ! brew link --overwrite bazelisk; then
fi

bazel version

pip3 install slackclient
2 changes: 1 addition & 1 deletion tools/code_format/check_shellcheck_format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

EXCLUDED_SHELLFILES=${EXCLUDED_SHELLFILES:-"^.github|.rst$|.md$"}
EXCLUDED_SHELLFILES=${EXCLUDED_SHELLFILES:-"^.github|.rst$|.md$|shell_utils.sh"}


find_shell_files () {
Expand Down
7 changes: 5 additions & 2 deletions tools/shell_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

set -x

source_venv() {
VENV_DIR=$1
if [[ "${VIRTUAL_ENV}" == "" ]]; then
if [[ ! -d "${VENV_DIR}"/venv ]]; then
virtualenv "${VENV_DIR}"/venv --python=python3
virtualenv "${VENV_DIR}"/venv --python=python3.8
fi
# shellcheck disable=SC1090
source "${VENV_DIR}/venv/bin/activate"
Expand All @@ -22,8 +22,11 @@ python_venv() {
VENV_DIR="${BUILD_DIR}/${PY_NAME}"

source_venv "${VENV_DIR}"
which pip # debug, temporary
pip install -r "${SCRIPT_DIR}"/requirements.txt

pip list # debug, temporary
shift
which python3 # debug, temporary
python3 "${SCRIPT_DIR}/${PY_NAME}.py" "$*"
}