Tools: clamp empy to version 3

API and syntax hanges make 4 problematic
This commit is contained in:
Peter Barker 2023-12-03 11:47:37 +11:00
parent 1bbb7595e9
commit ecc41d1b82
8 changed files with 9 additions and 10 deletions

View File

@ -7,7 +7,7 @@ import sys
try: try:
import em import em
except ImportError: except ImportError:
print("you need to install empy with 'python -m pip install empy'") print("you need to install empy with 'python -m pip install empy==3.3.4'")
sys.exit(1) sys.exit(1)
try: try:

View File

@ -112,7 +112,7 @@ class upload_fw(Task.Task):
and make sure to add it to your path during the installation. Once installed, run this and make sure to add it to your path during the installation. Once installed, run this
command in Powershell or Command Prompt to install some packages: command in Powershell or Command Prompt to install some packages:
pip.exe install empy pyserial pip.exe install empy==3.3.4 pyserial
**************************************** ****************************************
**************************************** ****************************************
""" % error_msg) """ % error_msg)

View File

@ -26,7 +26,7 @@ BASE_PKGS="base-devel ccache git gsfonts tk wget gcc"
SITL_PKGS="python-pip python-setuptools python-wheel python-wxpython opencv python-numpy python-scipy" SITL_PKGS="python-pip python-setuptools python-wheel python-wxpython opencv python-numpy python-scipy"
PX4_PKGS="lib32-glibc zip zlib ncurses" PX4_PKGS="lib32-glibc zip zlib ncurses"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy dronecan" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy==3.3.4 dronecan"
# GNU Tools for ARM Embedded Processors # GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/) # (see https://launchpad.net/gcc-arm-embedded/)

View File

@ -159,7 +159,7 @@ if [[ $DO_AP_STM_ENV -eq 1 ]]; then
install_arm_none_eabi_toolchain install_arm_none_eabi_toolchain
fi fi
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect geocoder flake8 empy dronecan" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect geocoder flake8 empy==3.3.4 dronecan"
# add some Python packages required for commonly-used MAVProxy modules and hex file generation: # add some Python packages required for commonly-used MAVProxy modules and hex file generation:
if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then
PYTHON_PKGS="$PYTHON_PKGS intelhex gnureadline" PYTHON_PKGS="$PYTHON_PKGS intelhex gnureadline"

View File

@ -144,9 +144,9 @@ fi
BASE_PKGS="build-essential ccache g++ gawk git make wget" BASE_PKGS="build-essential ccache g++ gawk git make wget"
if [ ${RELEASE_CODENAME} == 'bionic' ]; then if [ ${RELEASE_CODENAME} == 'bionic' ]; then
# use fixed version for package that drop python2 support # use fixed version for package that drop python2 support
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 requests==2.27.1 monotonic==1.6 geocoder empy configparser==4.0.2 click==7.1.2 decorator==4.4.2 dronecan" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 requests==2.27.1 monotonic==1.6 geocoder empy==3.3.4 configparser==4.0.2 click==7.1.2 decorator==4.4.2 dronecan"
else else
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8 geocoder empy dronecan" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8 geocoder empy==3.3.4 dronecan"
fi fi
# add some Python packages required for commonly-used MAVProxy modules and hex file generation: # add some Python packages required for commonly-used MAVProxy modules and hex file generation:

View File

@ -19,7 +19,7 @@ Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'ln -sf /usr/bin/pip3.7 /usr/bin/pip'" Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'ln -sf /usr/bin/pip3.7 /usr/bin/pip'"
Write-Output "Downloading extra Python packages (5/8)" Write-Output "Downloading extra Python packages (5/8)"
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'pip install empy pyserial pymavlink intelhex dronecan pexpect'" Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'pip install empy==3.3.4 pyserial pymavlink intelhex dronecan pexpect'"
Write-Output "Downloading APM source (6/8)" Write-Output "Downloading APM source (6/8)"
Copy-Item "APM_install.sh" -Destination "C:\cygwin64\home" Copy-Item "APM_install.sh" -Destination "C:\cygwin64\home"

View File

@ -19,7 +19,7 @@ Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'ln -sf /usr/bin/pip3.7 /usr/bin/pip'" Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'ln -sf /usr/bin/pip3.7 /usr/bin/pip'"
Write-Output "Downloading extra Python packages (5/7)" Write-Output "Downloading extra Python packages (5/7)"
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'pip install empy pyserial pymavlink intelhex dronecan pexpect'" Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'pip install empy==3.3.4 pyserial pymavlink intelhex dronecan pexpect'"
Write-Output "Installing ARM GCC Compiler 10-2020-Q4-Major (6/7)" Write-Output "Installing ARM GCC Compiler 10-2020-Q4-Major (6/7)"
& $PSScriptRoot\gcc-arm-none-eabi-10-2020-q4-major-win32.exe /S /P /R & $PSScriptRoot\gcc-arm-none-eabi-10-2020-q4-major-win32.exe /S /P /R

View File

@ -101,5 +101,4 @@ python -m pip install --progress-bar off --user -U argparse pyserial pexpect fut
python -m pip install --progress-bar off --user -U intelhex python -m pip install --progress-bar off --user -U intelhex
python -m pip install --progress-bar off --user -U numpy python -m pip install --progress-bar off --user -U numpy
python -m pip install --progress-bar off --user -U edn_format python -m pip install --progress-bar off --user -U edn_format
python -m pip install --progress-bar off --user -U empy python -m pip install --progress-bar off --user -U empy==3.3.4