try constraints.txt with urllib3 again

elastic · Aug 19, 2024 · 21f68ab · 21f68ab
1 parent 72ea229
commit 21f68ab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -80,19 +80,28 @@ license:  ## Run license validation in the project
 all-requirements: requirements-lint requirements-tests requirements ## Install all requirements on the host
 
 requirements: .makecache/requirements.txt  ## Install app requirements on the host
+requirements: .makecache/constraints.txt
+requirements: export PIP_ARGS=-c .makecache/constraints.txt
+requirements: install-requirements
 
 requirements-lint: .makecache/requirements-lint.txt  ## Install all linting requirements on the host
+requirements-lint: .makecache/constraints.txt
+requirements-lint: export PIP_ARGS=-c .makecache/constraints.txt
+requirements-lint: install-requirements-lint
 
 requirements-tests: .makecache/requirements-tests.txt  ## Install tests requirements on the host
+requirements-tests: .makecache/constraints.txt
+requirements-tests: export PIP_ARGS=-c .makecache/constraints.txt
+requirements-tests: install-requirements-tests
 
-.makecache/requirements.txt: requirements.txt
-	pip3 install -r requirements.txt
+install-requirements:
+	pip3 install -r requirements.txt $(PIP_ARGS)
 	touch .makecache/requirements.txt
 
-.makecache/requirements-lint.txt: requirements-lint.txt
-	pip3 install -r requirements-lint.txt
+install-requirements-lint:
+	pip3 install -r requirements-lint.txt $(PIP_ARGS)
 	touch .makecache/requirements-lint.txt
 
-.makecache/requirements-tests.txt: requirements-tests.txt
-	pip3 install -r requirements-tests.txt
+install-requirements-tests:
+	pip3 install -r requirements-tests.txt $(PIP_ARGS)
 	touch .makecache/requirements-tests.txt
diff --git a/constraints.txt b/constraints.txt
@@ -0,0 +1 @@
+urllib3==1.26.18
diff --git a/tests/scripts/docker/mypy.sh b/tests/scripts/docker/mypy.sh
@@ -20,7 +20,7 @@ docker run \
   --rm lint_mypy \
   /bin/bash \
   -c "pip install --user -U pip
-      pip install --user -r requirements.txt --cache-dir ${docker_pip_cache}
-      pip install --user -r requirements-lint.txt --cache-dir ${docker_pip_cache}
-      pip install --user -r requirements-tests.txt --cache-dir ${docker_pip_cache}
+      pip install --user -r requirements-lint.txt -c constraints.txt --cache-dir ${docker_pip_cache}
+      pip install --user -r requirements-tests.txt -c constraints.txt --cache-dir ${docker_pip_cache}
+      pip install --user -r requirements.txt -c constraints.txt --cache-dir ${docker_pip_cache}
       PATH=\${PATH}:\${HOME}/.local/bin/ /bin/bash ./tests/scripts/mypy.sh $*"