Skip to content

Commit db24ee8

Browse files
committed
peg setuptools version
1 parent d2353af commit db24ee8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

install/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pyro5==5.12
2727
pyserial==3.5
2828
python-dateutil==2.8.2
2929
requests==2.26.0
30-
setuptools==58.2.0
30+
setuptools==60.6.0
3131
SQLAlchemy==1.4.26
3232
Werkzeug==2.0.2
3333
WTForms==2.3.3

mycodo/scripts/upgrade_commands.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ MCB2835_URL="http://www.airspayce.com/mikem/bcm2835/bcm2835-1.50.tar.gz"
1919
WIRINGPI_URL="https://project-downloads.drogon.net/wiringpi-latest.deb"
2020
INFLUXDB_VERSION="1.8.0"
2121
VIRTUALENV_VERSION="20.7.0"
22+
SETUPTOOLS_VERSION="60.6.0"
2223

2324
# Required apt packages. This has been tested with Raspbian for the
2425
# Raspberry Pi and Ubuntu, it should work with most Debian-based systems.
@@ -463,7 +464,7 @@ case "${1:-''}" in
463464
if [[ ! -d ${MYCODO_PATH}/env ]]; then
464465
printf "\n## Error: Virtualenv doesn't exist. Create with %s setup-virtualenv\n" "${0}"
465466
else
466-
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip setuptools
467+
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip setuptools=="${SETUPTOOLS_VERSION}"
467468
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade -r "${MYCODO_PATH}"/install/requirements.txt
468469
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade -r "${MYCODO_PATH}"/install/requirements-rpi.txt
469470
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade -r "${MYCODO_PATH}"/install/requirements-testing.txt
@@ -591,7 +592,7 @@ case "${1:-''}" in
591592
;;
592593
'docker-update-pip-packages')
593594
printf "\n#### Installing pip requirements\n"
594-
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip setuptools
595+
"${MYCODO_PATH}"/env/bin/python -m pip install --upgrade pip setuptools=="${SETUPTOOLS_VERSION}"
595596
"${MYCODO_PATH}"/env/bin/python -m pip install --no-cache-dir -r /home/mycodo/install/requirements.txt
596597
;;
597598
'install-docker-ce-cli')

0 commit comments

Comments
 (0)