Skip to content

Commit 1e04123

Browse files
committed
build: also pin pip and setuptools
Mostly to get rid of the "you're not using the latest pip!" warning.
1 parent 19438b7 commit 1e04123

File tree

6 files changed

+24
-13
lines changed

6 files changed

+24
-13
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,17 @@ metacov: ## Run meta-coverage, measuring ourself.
7272
metahtml: ## Produce meta-coverage HTML reports.
7373
python igor.py combine_html
7474

75+
PIP_COMPILE = pip-compile --upgrade --allow-unsafe
7576
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
7677
upgrade: ## update the *.pip files with the latest packages satisfying *.in files
7778
pip install -q -r requirements/pip-tools.pip
78-
pip-compile --upgrade -o requirements/pip-tools.pip requirements/pip-tools.in
79-
pip-compile --upgrade -o requirements/pip.pip requirements/pip.in
80-
pip-compile --upgrade -o requirements/pytest.pip requirements/pytest.in
81-
pip-compile --upgrade -o requirements/kit.pip requirements/kit.in
82-
pip-compile --upgrade -o requirements/tox.pip requirements/tox.in
83-
pip-compile --upgrade -o requirements/dev.pip requirements/dev.in
84-
pip-compile --upgrade -o doc/requirements.pip doc/requirements.in
79+
$(PIP_COMPILE) -o requirements/pip-tools.pip requirements/pip-tools.in
80+
$(PIP_COMPILE) -o requirements/pip.pip requirements/pip.in
81+
$(PIP_COMPILE) -o requirements/pytest.pip requirements/pytest.in
82+
$(PIP_COMPILE) -o requirements/kit.pip requirements/kit.in
83+
$(PIP_COMPILE) -o requirements/tox.pip requirements/tox.in
84+
$(PIP_COMPILE) -o requirements/dev.pip requirements/dev.in
85+
$(PIP_COMPILE) -o doc/requirements.pip doc/requirements.in
8586

8687
# Kitting
8788

doc/requirements.pip

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,5 @@ urllib3==1.26.7
9797
# via requests
9898

9999
# The following packages are considered to be unsafe in a requirements file:
100-
# setuptools
100+
setuptools==58.3.0
101+
# via sphinx

requirements/dev.pip

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,9 @@ zipp==3.6.0
210210
# via importlib-metadata
211211

212212
# The following packages are considered to be unsafe in a requirements file:
213-
# setuptools
213+
pip==21.3.1
214+
# via -r requirements/pip.pip
215+
setuptools==58.3.0
216+
# via
217+
# astroid
218+
# check-manifest

requirements/kit.pip

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ wheel==0.37.0
3535
# via -r requirements/kit.in
3636

3737
# The following packages are considered to be unsafe in a requirements file:
38-
# setuptools
38+
setuptools==58.3.0
39+
# via -r requirements/kit.in

requirements/pip-tools.pip

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ wheel==0.37.0
1616
# via pip-tools
1717

1818
# The following packages are considered to be unsafe in a requirements file:
19-
# pip
20-
# setuptools
19+
pip==21.3.1
20+
# via pip-tools
21+
setuptools==58.3.0
22+
# via pip-tools

requirements/pip.pip

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ virtualenv==20.9.0
1818
# via -r requirements/pip.in
1919

2020
# The following packages are considered to be unsafe in a requirements file:
21-
# pip
21+
pip==21.3.1
22+
# via -r requirements/pip.in

0 commit comments

Comments
 (0)