Skip to content

Commit 8d632e7

Browse files
committed
Rename the top-level requirements.txt file.
Some tools cannot help themselves: they see a `requirements.txt` file, and immediately they assume it is intended for them and they MUST try to install whatever it contains. No, `mkdocs-deploy-gh-pages`, those requirements ARE NOT FOR YOU!
1 parent 176c7a2 commit 8d632e7

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ publish-multiarch-dev:
156156
.
157157

158158
# This should use the same base image as the one used to build the ODK itself.
159-
constraints.txt: requirements.txt
159+
constraints.txt: python-requirements.txt
160160
docker run -v $$PWD:/work -w /work --rm -ti ubuntu:24.04 /work/scripts/update-constraints.sh --in-docker
161161

162162
clean-tests:

docker/builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN apt-get update && \
3737
# Therefore we install all of them on the builder image (where we have
3838
# all the build tools required to compile them if needed), and we'll
3939
# copy the entire Python tree to the final images.
40-
COPY requirements.txt /build/requirements.txt
40+
COPY python-requirements.txt /build/requirements.txt
4141
COPY constraints.txt /build/constraints.txt
4242
COPY pip-constraints.txt /build/pip-constraints.txt
4343
RUN find /usr/lib/python3/dist-packages -type d -name '*-info' | \

scripts/update-constraints.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fi
3131
virtualenv -p ${PYTHON_VERSION:-3.12} tmpdir
3232
. tmpdir/bin/activate
3333
[ -f pip-constraints.txt ] && export PIP_CONSTRAINT=$(pwd)/pip-constraints.txt
34-
python3 -m pip install -r requirements.txt
34+
python3 -m pip install -r python-requirements.txt
3535
python3 -m pip freeze | grep -v ^odk-core > constraints.txt
3636

3737
test -n "$(head constraints.txt)"

0 commit comments

Comments
 (0)