Skip to content

Commit

Permalink
fix: Restore pip-compile invocation
Browse files Browse the repository at this point in the history
In eb9ee31, 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.
  • Loading branch information
aiven-anton committed May 13, 2024
1 parent 56db408 commit 0999c94
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
SHELL := bash
.SHELLFLAGS := -euxo pipefail -O globstar -c
.ONESHELL:
.SILENT:
.SUFFIXES:

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0999c94

Please sign in to comment.