From 28226bc1dab95e4bf9d0cdf2be4bba06b8ef0d74 Mon Sep 17 00:00:00 2001 From: Viacheslav Greshilov Date: Tue, 17 May 2022 23:00:47 +0300 Subject: [PATCH 1/2] Fix pip reinstallation on windows due to constraints --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 57b3601d24d..3620de4361f 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ endif @python -m pip install --upgrade pip .install-cython: .update-pip $(call to-hash,requirements/cython.txt) - @pip install -r requirements/cython.txt -c requirements/constraints.txt + @python -m pip install -r requirements/cython.txt -c requirements/constraints.txt @touch .install-cython aiohttp/_find_header.c: $(call to-hash,aiohttp/hdrs.py ./tools/gen.py) @@ -74,7 +74,7 @@ generate-llhttp: .llhttp-gen cythonize: .install-cython $(PYXS:.pyx=.c) .install-deps: .install-cython $(PYXS:.pyx=.c) $(call to-hash,$(CYS) $(REQS)) - @pip install -r requirements/dev.txt -c requirements/constraints.txt + @python -m pip install -r requirements/dev.txt -c requirements/constraints.txt @touch .install-deps .PHONY: lint @@ -89,7 +89,7 @@ mypy: mypy .develop: .install-deps generate-llhttp $(call to-hash,$(PYS) $(CYS) $(CS)) - pip install -e . -c requirements/constraints.txt + python -m pip install -e . -c requirements/constraints.txt @touch .develop .PHONY: test @@ -189,7 +189,7 @@ compile-deps: .update-pip $(REQS) .PHONY: install install: .update-pip - @pip install -r requirements/dev.txt -c requirements/constraints.txt + @python -m pip install -r requirements/dev.txt -c requirements/constraints.txt .PHONY: install-dev install-dev: .develop From f2059044391d9a1ea5fbd2f3f526d918f9cfee60 Mon Sep 17 00:00:00 2001 From: Viacheslav Greshilov Date: Wed, 18 May 2022 16:00:28 +0300 Subject: [PATCH 2/2] tmp --- requirements/constraints.txt | 6 +++--- requirements/dev.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e1f6351b41a..b3fe3d271f0 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -123,7 +123,7 @@ pep517==0.12.0 # via pip-tools pillow==9.0.1 # via blockdiag -pip-tools==6.5.0 +pip-tools==6.6.1 # via -r requirements/dev.txt platformdirs==2.4.0 # via virtualenv @@ -257,9 +257,9 @@ yarl==1.7.2 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 +pip==22.1 # via pip-tools -setuptools==58.4.0 +setuptools==62.3.1 # via # blockdiag # gunicorn diff --git a/requirements/dev.txt b/requirements/dev.txt index 2298dc8b2ef..0c56af89759 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,4 +2,4 @@ -r test.txt -r doc.txt cherry_picker==2.1.0 -pip-tools==6.5.0 +pip-tools==6.6.1