Skip to content

Commit 7f46906

Browse files
committed
Fix broken development setup
This removes circular dependency in Makefile added in pypi#10278 Unblocks pypi#10052 Fixes pypi#10446 Fixes pypi#10447
1 parent 5c78122 commit 7f46906

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,15 @@ default:
4444
@echo
4545
@exit 1
4646

47-
.state/env/pyvenv.cfg: requirements/dev.txt requirements/docs.txt requirements/lint.txt requirements/ipython.txt
48-
# Create our Python 3.8 virtual environment
47+
.state/env/01bootstrap: requirements/bootstrap.txt
48+
# Create Python 3.8 virtual environment with `pip-compile` for updating
49+
# dependecy hashes
4950
rm -rf .state/env
5051
python3.8 -m venv .state/env
52+
.state/env/bin/python -m pip install -r requirements/bootstrap.txt
53+
touch .state/env/01bootstrap
54+
55+
.state/env/02install: .state/env/01bootstrap requirements/dev.txt requirements/docs.txt requirements/lint.txt requirements/ipython.txt
5156

5257
# install/upgrade general requirements
5358
.state/env/bin/python -m pip install --upgrade pip setuptools wheel
@@ -127,7 +132,7 @@ deps: .state/env/pyvenv.cfg
127132
rm -r $(TMPDIR)
128133
$(BINDIR)/pip check
129134

130-
requirements/%.txt: requirements/%.in .state/env/pyvenv.cfg
135+
requirements/%.txt: requirements/%.in .state/env/01bootstrap
131136
$(BINDIR)/pip-compile --allow-unsafe --generate-hashes --output-file=$@ $<
132137

133138
fix-google-deps:

requirements/bootstrap.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Securely installing `pip-compile` for regenerating dependencies.
3+
#
4+
# This file is autogenerated by pip-compile
5+
# To update, run:
6+
#
7+
# pip-compile --generate-hashes --output-file=requirements/boot.txt -
8+
#
9+
click==7.1.2 \
10+
--hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
11+
--hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
12+
# via pip-tools
13+
pip-tools==5.5.0 \
14+
--hash=sha256:10841c1e56c234d610d0466447685b9ea4ee4a2c274f858c0ef3c33d9bd0d985 \
15+
--hash=sha256:cb0108391366b3ef336185097b3c2c0f3fa115b15098dafbda5e78aef70ea114
16+
# via -r -
17+
18+
# WARNING: The following packages were not pinned, but pip requires them to be
19+
# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
20+
# pip

0 commit comments

Comments
 (0)