Skip to content

Commit

Permalink
Use uv instead of pip in development env (home-assistant#113517)
Browse files Browse the repository at this point in the history
  • Loading branch information
edenhaus authored May 21, 2024
1 parent d44f949 commit 5e3483a
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 28 deletions.
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"postCreateCommand": "script/setup",
"postStartCommand": "script/bootstrap",
"containerEnv": {
"DEVCONTAINER": "1",
"PYTHONASYNCIODEBUG": "1"
},
"features": {
Expand All @@ -29,7 +28,9 @@
// Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
"settings": {
"python.experiments.optOutFrom": ["pythonTestAdapter"],
"python.pythonPath": "/usr/local/bin/python",
"python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
"python.pythonPath": "/home/vscode/.local/ha-venv/bin/python",
"python.terminal.activateEnvInCurrentTerminal": true,
"python.testing.pytestArgs": ["--no-cov"],
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
Expand Down
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
{
"label": "Install all Requirements",
"type": "shell",
"command": "pip3 install -r requirements_all.txt",
"command": "uv pip install -r requirements_all.txt",
"group": {
"kind": "build",
"isDefault": true
Expand All @@ -117,7 +117,7 @@
{
"label": "Install all Test Requirements",
"type": "shell",
"command": "pip3 install -r requirements_test_all.txt",
"command": "uv pip install -r requirements_test_all.txt",
"group": {
"kind": "build",
"isDefault": true
Expand Down
19 changes: 14 additions & 5 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,30 @@ RUN \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install uv
RUN pip3 install uv

WORKDIR /usr/src

# Setup hass-release
RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
&& pip3 install -e hass-release/
&& uv pip install --system -e hass-release/

WORKDIR /workspaces
USER vscode
ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
RUN uv venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

WORKDIR /tmp

# Install Python dependencies from requirements
COPY requirements.txt ./
COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
RUN pip3 install -r requirements.txt
RUN uv pip install -r requirements.txt
COPY requirements_test.txt requirements_test_pre_commit.txt ./
RUN pip3 install -r requirements_test.txt
RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
RUN uv pip install -r requirements_test.txt

WORKDIR /workspaces

# Set the default shell to bash instead of sh
ENV SHELL /bin/bash
6 changes: 3 additions & 3 deletions script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ set -e
cd "$(dirname "$0")/.."

echo "Installing development dependencies..."
python3 -m pip install wheel --constraint homeassistant/package_constraints.txt --upgrade
python3 -m pip install colorlog $(grep awesomeversion requirements.txt) --constraint homeassistant/package_constraints.txt --upgrade
python3 -m pip install -r requirements_test.txt -c homeassistant/package_constraints.txt --upgrade
uv pip install wheel --constraint homeassistant/package_constraints.txt --upgrade
uv pip install colorlog $(grep awesomeversion requirements.txt) --constraint homeassistant/package_constraints.txt --upgrade
uv pip install -r requirements_test.txt -c homeassistant/package_constraints.txt --upgrade
2 changes: 1 addition & 1 deletion script/hassfest/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def install_requirements(integration: Integration, requirements: set[str]) -> bo
if is_installed:
continue

args = [sys.executable, "-m", "pip", "install", "--quiet"]
args = ["uv", "pip", "install", "--quiet"]
if install_args:
args.append(install_args)
args.append(requirement_arg)
Expand Down
3 changes: 1 addition & 2 deletions script/install_integration_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ def main() -> int | None:
requirements = gather_recursive_requirements(args.integration)

cmd = [
sys.executable,
"-m",
"uv",
"pip",
"install",
"-c",
Expand Down
4 changes: 2 additions & 2 deletions script/monkeytype
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ cd "$(dirname "$0")/.."

command -v pytest >/dev/null 2>&1 || {
echo >&2 "This script requires pytest but it's not installed." \
"Aborting. Try: pip install pytest"; exit 1; }
"Aborting. Try: uv pip install pytest"; exit 1; }

command -v monkeytype >/dev/null 2>&1 || {
echo >&2 "This script requires monkeytype but it's not installed." \
"Aborting. Try: pip install monkeytype"; exit 1; }
"Aborting. Try: uv pip install monkeytype"; exit 1; }

if [ $# -eq 0 ]
then
Expand Down
20 changes: 12 additions & 8 deletions script/run-in-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ if [ -s .python-version ]; then
export PYENV_VERSION
fi

# other common virtualenvs
my_path=$(git rev-parse --show-toplevel)
if [ -n "${VIRTUAL_ENV}" ] && [ -f "${VIRTUAL_ENV}/bin/activate" ]; then
. "${VIRTUAL_ENV}/bin/activate"
else
# other common virtualenvs
my_path=$(git rev-parse --show-toplevel)

for venv in venv .venv .; do
if [ -f "${my_path}/${venv}/bin/activate" ]; then
. "${my_path}/${venv}/bin/activate"
break
fi
done
for venv in venv .venv .; do
if [ -f "${my_path}/${venv}/bin/activate" ]; then
. "${my_path}/${venv}/bin/activate"
break
fi
done
fi

exec "$@"
14 changes: 11 additions & 3 deletions script/setup
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,23 @@ fi

mkdir -p config

if [ ! -n "$DEVCONTAINER" ] && [ ! -n "$VIRTUAL_ENV" ];then
python3 -m venv venv
if [ ! -n "$VIRTUAL_ENV" ]; then
if [ -x "$(command -v uv)" ]; then
uv venv venv
else
python3 -m venv venv
fi
source venv/bin/activate
fi

if ! [ -x "$(command -v uv)" ]; then
python3 -m pip install uv
fi

script/bootstrap

pre-commit install
python3 -m pip install -e . --config-settings editable_mode=compat --constraint homeassistant/package_constraints.txt
uv pip install -e . --config-settings editable_mode=compat --constraint homeassistant/package_constraints.txt
python3 -m script.translations develop --all

hass --script ensure_config -c config
Expand Down

0 comments on commit 5e3483a

Please sign in to comment.