From 591a259346d5c1342a294f33133fce1a38e5c241 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 1 Jan 2025 21:12:37 -0800 Subject: [PATCH] Add pip updates to make update target --- Makefile | 7 ++++++- requirements.txt | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 83a344ff5e..6128d69c16 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,9 @@ VENV ?= .venv VENV_ACTIVATE := $(VENV)/bin/activate VENV_MESON := . $(VENV_ACTIVATE) ; $(MESON) VENV_NINJA := . $(VENV_ACTIVATE) ; $(NINJA) +VENV_PIP := . $(VENV_ACTIVATE) ; pip + +PIP_REQUIREMENTS := requirements.txt ifneq (,$(findstring Microsoft,$(UNAME_R))) ifneq (,$(filter /mnt/%,$(CWD))) @@ -79,6 +82,8 @@ clean: $(BUILD)/build.ninja $(VENV_MESON) compile -C $(BUILD) --clean update: $(BUILD)/build.ninja + $(VENV_PIP) install --upgrade pip + $(VENV_PIP) install --upgrade -r $(PIP_REQUIREMENTS) $(VENV_MESON) subprojects update distclean: @@ -96,7 +101,7 @@ venv: $(VENV_ACTIVATE) $(VENV_ACTIVATE): python3 -m venv $(VENV) - . $(VENV_ACTIVATE) ; pip install -r requirements.txt + . $(VENV_ACTIVATE) ; pip install -r $(PIP_REQUIREMENTS) $(BUILD)/build.ninja: $(ROOT_INI) $(DOT_MWCONFIG) $(VENV_ACTIVATE) | $(BUILD) . $(VENV_ACTIVATE) ; MWCONFIG=$(abspath $(DOT_MWCONFIG)) $(MESON) setup \ diff --git a/requirements.txt b/requirements.txt index 7fe66520e8..3682e6b9de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -meson >= 1.3.* -ninja >= 1.11.* +meson >= 1.3.0 +ninja >= 1.11.0