Skip to content

Commit a49f77c

Browse files
committed
fix workflow
1 parent cb8b4e8 commit a49f77c

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

mycodo/scripts/upgrade_commands.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ WIRINGPI_URL_ARM64="https://github.com/WiringPi/WiringPi/releases/download/2.61-
2222
INFLUXDB1_VERSION="1.8.10"
2323
INFLUXDB2_VERSION="2.6.1"
2424

25-
VIRTUALENV_VERSION="20.17.1"
26-
2725
# Required apt packages
28-
APT_PKGS="gawk gcc g++ git jq libatlas-base-dev libffi-dev libi2c-dev logrotate moreutils netcat-openbsd nginx python3 python3-pip python3-dev python3-setuptools rng-tools sqlite3 unzip wget"
29-
30-
PYTHON_BINARY_SYS_LOC="$(python3 -c "import os; print(os.environ['_'])")"
26+
APT_PKGS="gawk gcc g++ git jq libatlas-base-dev libffi-dev libi2c-dev logrotate moreutils netcat-openbsd nginx python3 python3-dev python3-pip python3-setuptools python3-venv rng-tools sqlite3 unzip wget"
3127

3228
UNAME_TYPE=$(uname -m)
3329
MACHINE_TYPE=$(dpkg --print-architecture)
@@ -220,10 +216,9 @@ case "${1:-''}" in
220216
'setup-virtualenv')
221217
printf "\n#### Checking Python 3 virtual environment\n"
222218
if [[ ! -e ${MYCODO_PATH}/env/bin/python ]]; then
223-
printf "#### Creating virtualenv with ${PYTHON_BINARY_SYS_LOC} at "${MYCODO_PATH}"/env\n"
224-
python3 -m pip install --break-system-packages virtualenv==${VIRTUALENV_VERSION}
219+
printf "#### Creating virtual environment at "${MYCODO_PATH}"/env\n"
225220
rm -rf "${MYCODO_PATH}"/env
226-
python3 -m virtualenv -p "${PYTHON_BINARY_SYS_LOC}" "${MYCODO_PATH}"/env
221+
python3 -m venv "${MYCODO_PATH}"/env
227222
fi
228223
;;
229224
'setup-virtualenv-full')
@@ -582,7 +577,6 @@ case "${1:-''}" in
582577
apt remove -y apache2
583578
apt install -y ${APT_PKGS}
584579
apt clean
585-
python3 -m pip install --break-system-packages --upgrade pip
586580
;;
587581
'update-permissions')
588582
printf "\n#### Setting permissions\n"

0 commit comments

Comments
 (0)