From 0999c94955c5074d62c1c17b6c1833560868ee83 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Mon, 13 May 2024 15:47:35 +0200 Subject: [PATCH] fix: Restore pip-compile invocation In eb9ee31b3ff5879546d70737903cd6941562fb2d, pip-compile was changed to no longer cd into the requirements directory. The reason for this change was because of the use of `ONESHELL` which causes diverging behavior in environments with make versions that don't yet support this mode. This commit reverts the removal of the `cd` invocations, and additionally removes the `ONESHELL` option which should make behavior aligned across dev envs. --- GNUmakefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 0b5afdbb5..9d5c53a06 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -18,7 +18,6 @@ MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --no-builtin-rules SHELL := bash .SHELLFLAGS := -euxo pipefail -O globstar -c -.ONESHELL: .SILENT: .SUFFIXES: @@ -86,9 +85,9 @@ cleanest: cleaner requirements: export CUSTOM_COMPILE_COMMAND='make requirements' requirements: pip install --upgrade pip setuptools pip-tools - pip-compile --upgrade --resolver=backtracking requirements/requirements.in -o requirements/requirements.txt - pip-compile --upgrade --resolver=backtracking requirements/requirements-dev.in -o requirements/requirements-dev.txt - pip-compile --upgrade --resolver=backtracking requirements/requirements-typing.in -o requirements/requirements-typing.txt + cd requirements && pip-compile --upgrade --resolver=backtracking requirements.in -o requirements.txt + cd requirements && pip-compile --upgrade --resolver=backtracking requirements-dev.in -o requirements-dev.txt + cd requirements && pip-compile --upgrade --resolver=backtracking requirements-typing.in -o requirements-typing.txt .PHONY: schema schema: against := origin/main