Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-10-02 10:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tools: remove now-unnecessary Python future dependency

Browse Source 
Neither we nor our dependencies need it anymore.
This commit is contained in:
Thomas Watson
2026-03-24 09:33:17 -05:00
committed by Thomas Watson
parent 4b39fe34ae
commit 2d14165ec5
9 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/environment_install/install-prereqs-alpine.sh
-1
View File
@@ -12,7 +12,6 @@ apk update && apk add --no-cache \
linux-headers \
g++ \
python3 \
py-future \
py-pip \
libxml2-dev \
libxslt-dev \
Tools/environment_install/install-prereqs-arch.sh
+1 -1
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"
PX4_PKGS="lib32-glibc zip zlib ncurses"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy==3.3.4 dronecan packaging setuptools wheel"
PYTHON_PKGS="lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsing geocoder pyserial empy==3.3.4 dronecan packaging setuptools wheel"
# GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/)
Tools/environment_install/install-prereqs-mac.sh
+1 -1
View File
@@ -167,7 +167,7 @@ if [[ $DO_AP_STM_ENV -eq 1 ]]; then
install_arm_none_eabi_toolchain
fi
PYTHON_PKGS="setuptools future lxml matplotlib pymavlink MAVProxy pexpect geocoder flake8 junitparser empy==3.3.4 dronecan"
PYTHON_PKGS="setuptools lxml matplotlib pymavlink MAVProxy pexpect geocoder flake8 junitparser empy==3.3.4 dronecan"
# add some Python packages required for commonly-used MAVProxy modules and hex file generation:
if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then
PYTHON_PKGS="$PYTHON_PKGS intelhex gnureadline"
Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh
+1 -1
View File
@@ -59,7 +59,7 @@ PYPKGVER=python$(python3 --version | cut -d' ' -f2 | awk -F. '{print $1$2}')
BASE_PKGS="patterns-devel-base-devel_basis ccache git axel valgrind screen gcc-c++ xterm free-ttf-fonts sfml2-devel zip glibc-devel-static rsync"
SITL_PKGS="${PYPKGVER}-pip ${PYPKGVER}-devel ${PYPKGVER}-setuptools ${PYPKGVER}-wheel ${PYPKGVER}-lxml ${PYPKGVER}-pyaml ${PYPKGVER}-wxPython ${PYPKGVER}-pyparsing ${PYPKGVER}-opencv ${PYPKGVER}-numpy ${PYPKGVER}-scipy ${PYPKGVER}-matplotlib"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse pyparsing geocoder pyserial empy==3.3.4 ptyprocess dronecan"
PYTHON_PKGS="lxml pymavlink MAVProxy pexpect argparse pyparsing geocoder pyserial empy==3.3.4 ptyprocess dronecan"
PYTHON_PKGS+=" flake8 junitparser pygame intelhex psutil pyyaml"
# GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/)
Tools/environment_install/install-prereqs-ubuntu.sh
+1 -1
View File
@@ -194,7 +194,7 @@ fi
# Lists of packages to install
BASE_PKGS="build-essential ccache g++ gawk git make wget valgrind screen python3-pexpect astyle"
PYTHON_PKGS="future lxml pymavlink pyserial MAVProxy geocoder empy==3.3.4 ptyprocess dronecan"
PYTHON_PKGS="lxml pymavlink pyserial MAVProxy geocoder empy==3.3.4 ptyprocess dronecan"
PYTHON_PKGS="$PYTHON_PKGS flake8 junitparser wsproto tabulate"
# add some Python packages required for commonly-used MAVProxy modules and hex file generation:
Tools/environment_install/install-prereqs-windows-andAPMSource.ps1
+1 -1
View File
@@ -14,7 +14,7 @@ Write-Output "Downloading ARM GCC Compiler 10-2020-Q4-Major (3/8)"
Start-BitsTransfer -Source "https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-10-2020-q4-major-win32.exe" -Destination "$PSScriptRoot\gcc-arm-none-eabi-10-2020-q4-major-win32.exe"
Write-Output "Installing Cygwin x64 (4/8)"
Start-Process -wait -FilePath $PSScriptRoot\setup-x86_64.exe -ArgumentList "--root=C:\cygwin64 --no-startmenu --local-package-dir=$env:USERPROFILE\Downloads --site=http://cygwin.mirror.constant.com --packages autoconf,automake,ccache,cygwin32-gcc-g++,gcc-g++=7.4.0-1,libgcc1=7.4.0.1,gcc-core=7.4.0-1,git,libtool,make,gawk,libexpat-devel,libxml2-devel,python39,python39-future,python39-lxml,python39-pip,libxslt-devel,python39-devel,procps-ng,zip,gdb,ddd --quiet-mode"
Start-Process -wait -FilePath $PSScriptRoot\setup-x86_64.exe -ArgumentList "--root=C:\cygwin64 --no-startmenu --local-package-dir=$env:USERPROFILE\Downloads --site=http://cygwin.mirror.constant.com --packages autoconf,automake,ccache,cygwin32-gcc-g++,gcc-g++=7.4.0-1,libgcc1=7.4.0.1,gcc-core=7.4.0-1,git,libtool,make,gawk,libexpat-devel,libxml2-devel,python39,python39-lxml,python39-pip,libxslt-devel,python39-devel,procps-ng,zip,gdb,ddd --quiet-mode"
Write-Output "Downloading extra Python packages (5/8)"
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'python3.9 -m pip install empy==3.3.4 pyserial intelhex dronecan pexpect'"
Tools/environment_install/install-prereqs-windows.ps1
+1 -1
View File
@@ -14,7 +14,7 @@ Write-Output "Downloading ARM GCC Compiler 10-2020-Q4-Major (3/7)"
Start-BitsTransfer -Source "https://firmware.ardupilot.org/Tools/STM32-tools/gcc-arm-none-eabi-10-2020-q4-major-win32.exe" -Destination "$PSScriptRoot\gcc-arm-none-eabi-10-2020-q4-major-win32.exe"
Write-Output "Installing Cygwin x64 (4/7)"
Start-Process -wait -FilePath $PSScriptRoot\setup-x86_64.exe -ArgumentList "--root=C:\cygwin64 --no-startmenu --local-package-dir=$env:USERPROFILE\Downloads --site=http://cygwin.mirror.constant.com --packages autoconf,automake,ccache,cygwin32-gcc-g++,gcc-g++=7.4.0-1,libgcc1=7.4.0.1,gcc-core=7.4.0-1,git,libtool,make,gawk,libexpat-devel,libxml2-devel,python39,python39-future,python39-lxml,python39-pip,libxslt-devel,python39-devel,procps-ng,zip,gdb,ddd,xterm --quiet-mode"
Start-Process -wait -FilePath $PSScriptRoot\setup-x86_64.exe -ArgumentList "--root=C:\cygwin64 --no-startmenu --local-package-dir=$env:USERPROFILE\Downloads --site=http://cygwin.mirror.constant.com --packages autoconf,automake,ccache,cygwin32-gcc-g++,gcc-g++=7.4.0-1,libgcc1=7.4.0.1,gcc-core=7.4.0-1,git,libtool,make,gawk,libexpat-devel,libxml2-devel,python39,python39-lxml,python39-pip,libxslt-devel,python39-devel,procps-ng,zip,gdb,ddd,xterm --quiet-mode"
Write-Output "Downloading extra Python packages (5/7)"
Start-Process -wait -FilePath "C:\cygwin64\bin\bash" -ArgumentList "--login -i -c 'python3.9 -m pip install empy==3.3.4 pyserial intelhex dronecan pexpect'"
Tools/scripts/configure-ci.sh
+1 -1
View File
@@ -97,7 +97,7 @@ fi
. ~/.profile
python3 -m pip install --progress-bar off --user -U argparse pyserial pexpect future lxml
python3 -m pip install --progress-bar off --user -U argparse pyserial pexpect lxml
python3 -m pip install --progress-bar off --user -U intelhex
python3 -m pip install --progress-bar off --user -U numpy
python3 -m pip install --progress-bar off --user -U edn_format
Tools/scripts/esp32_get_idf.sh
-1
View File
@@ -60,7 +60,6 @@ echo
echo "installing missing python modules"
python3 -m pip install empy==3.3.4
python3 -m pip install pexpect
python3 -m pip install future
cd ../..