Use Direnv and put back venv into ardupilot directory#32731
Open
khancyr wants to merge 3 commits into
Open
Conversation
yuri-rage
approved these changes
Apr 11, 2026
yuri-rage
left a comment
yuri-rage
left a comment
Contributor
There was a problem hiding this comment.
Tested under 24.04 - nice work!
tpwrules
reviewed
Apr 11, 2026
Comment on lines
+479
to
+488
|
|
||
| # Check if running inside the deprecated ~/venv-ardupilot venv | ||
| deprecated_venv = os.path.join(os.path.expanduser('~'), 'venv-ardupilot') | ||
| if sys.executable.startswith(os.path.realpath(deprecated_venv)): | ||
| cfg.fatal( | ||
| f'You are using the deprecated venv at {deprecated_venv}. ' | ||
| 'Please re-run Tools/environment_install/install-prereqs-ubuntu.sh ' | ||
| 'to update your environment to use the new .venv in the repository root.' | ||
| ) | ||
|
|
Contributor
There was a problem hiding this comment.
I don't see the value in this and see lots of potential annoyance. Please remove it.
cclauss
reviewed
Apr 12, 2026
Contributor
There was a problem hiding this comment.
$APT_GET install python3-venv should work for all these distros (Jammy included).
Why are we trying to reuse venvs? The docs clearly say in big red text that venvs are not portable. They should not be moved to a new location or checked into GitHub. Just create new ones.
Activating a venv automatically deactivates any previously activated venvs.
| # instead of auto-loading in the shell login file. | ||
| USE_DIRENV=false | ||
| if [ ${RELEASE_CODENAME} == 'bookworm' ]; then | ||
| PYTHON_VENV_PACKAGE=python3.11-venv |
Contributor
There was a problem hiding this comment.
Suggested change
| PYTHON_VENV_PACKAGE=python3.11-venv | |
| PYTHON_VENV_PACKAGE=python3-venv |
Proof:
% docker run -it debian:bookworm
# apt update && \
DEBIAN_FRONTEND=noninteractive apt install --yes lsb-release python3-venv && \
lsb_release -ds && \
python3 -m venv --upgrade-deps .venv && \
source .venv/bin/activate &&
python -V && \
pip -V
Debian GNU/Linux 12 (bookworm)
Python 3.11.2
pip 26.0.1 from /.venv/lib/python3.11/site-packages/pip (python 3.11)
| PYTHON_VENV_PACKAGE=python3.11-venv | ||
| USE_DIRENV=true | ||
| elif [ ${RELEASE_CODENAME} == 'noble' ]; then | ||
| PYTHON_VENV_PACKAGE=python3.12-venv |
Contributor
There was a problem hiding this comment.
Suggested change
| PYTHON_VENV_PACKAGE=python3.12-venv | |
| PYTHON_VENV_PACKAGE=python3-venv |
Proof:
% docker run -it ubuntu:noble
# apt update && \
DEBIAN_FRONTEND=noninteractive apt install --yes lsb-release python3-venv && \
lsb_release -ds && \
python3 -m venv --upgrade-deps .venv && \
source .venv/bin/activate &&
python -V && \
pip -V
Ubuntu 24.04.4 LTS
Python 3.12.3
pip 26.0.1 from /.venv/lib/python3.12/site-packages/pip (python 3.12)
| PYTHON_VENV_PACKAGE=python3.12-venv | ||
| USE_DIRENV=true | ||
| elif [ ${RELEASE_CODENAME} == 'trixie' ] || | ||
| [ ${RELEASE_CODENAME} == 'plucky' ] || |
Contributor
There was a problem hiding this comment.
This month, Plucky will probably disappear from https://ports.ubuntu.com/ubuntu-ports/dists
Contributor
|
Will need a rebase now that #32754 is merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
we are currently make a venv into home space and load it as a global environement. This cause a lot of issue for developpers that want to use some other venv or Tools as we are overriding everything.
This PR put back the things properly into ardupilot directory.
Drawback is that people won't have global scope ardupilot tools anymore unless they enable the venv manually
This also install direnv that is an utility to autoload and unload venv when entering into ardupilot directory. That would make thing easier and transparent for most developper and allow those that don't want it to not use it and manage their venv as they want.
A blocking text is added to waf to ask people to move out from the old installation
Classification & Testing (check all that apply and add your own)
Tested locally, without venv, with .venv, with /home/user/venv-ardupilot, with another shell (zsh) and on docker