Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ci tmp #223

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ci tmp #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28226bc
Fix pip reinstallation on windows due to constraints
greshilov May 17, 2022
f205904
tmp
greshilov May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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