From 8942d808a585f7645e10c4c815fed3bc2b1cb4db Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 22 Apr 2024 23:29:47 -0400 Subject: [PATCH] build: Explicitly install setuptools in ci.txt We need setuptools to run tox but it doesn't get install by default in python environmnets starting with Python 3.12 so explicitly install it when setting up the CI enviromnent. --- Makefile | 2 +- requirements/ci.in | 1 + requirements/ci.txt | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a615839b81..b0d84151c0 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ upgrade: requirements check_pins ## update the requirements/*.txt files with the $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/doc.txt requirements/doc.in $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/test.txt requirements/test.in $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/dev.txt requirements/dev.in - $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/ci.txt requirements/ci.in + $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url --allow-unsafe -o requirements/ci.txt requirements/ci.in $(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/js_test.txt requirements/js_test.in # This section removes django from test.txt to # let tox control the Django version for tests diff --git a/requirements/ci.in b/requirements/ci.in index ffbaa2043b..ff2566be5a 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -3,3 +3,4 @@ -c constraints.txt tox # Virtualenv management for tests +setuptools diff --git a/requirements/ci.txt b/requirements/ci.txt index c7cfe38210..1560e62423 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -28,3 +28,7 @@ tox==3.28.0 # -r requirements/ci.in virtualenv==20.25.3 # via tox + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.5.1 + # via -r requirements/ci.in