Skip to content
This repository was archived by the owner on Oct 13, 2021. It is now read-only.

Commit 957e37c

Browse files
abbeyjabbeyj
committed
Remove deprecated peep.py and use pip install --require-hashes instead.
1 parent 06f9327 commit 957e37c

File tree

5 files changed

+72
-1073
lines changed

5 files changed

+72
-1073
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
/docs/build
2222
.dxr_installed
2323
.npm_installed
24-
.peep_installed
24+
.requirements_installed
2525
/venv
2626
/*.egg

‎dxr/cli/deploy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def build(self, rev):
190190
# Does this recurse into submodules?
191191
run('git fsck --no-dangling')
192192

193-
# Install stuff, using the new copy of peep from the checkout:
193+
# Install stuff, using the copy of pip from the checkout:
194194
venv = join(new_build_path, VENV_NAME)
195195
run('VIRTUAL_ENV={venv} make requirements', venv=venv)
196196
# Compile nunjucks templates and cachebust static assets:

‎makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ lint: $(VIRTUAL_ENV)/bin/activate requirements
2222

2323
clean: static_clean
2424
rm -rf .npm_installed \
25-
.peep_installed \
25+
.requirements_installed \
2626
venv \
2727
.dxr_installed
2828
@# Remove anything within node_modules that's not checked into git. Skip things
@@ -88,7 +88,7 @@ docker_machine:
8888
# creating one for you, you'll need Python packages installed.
8989
$(VIRTUAL_ENV)/bin/activate:
9090
virtualenv $(VIRTUAL_ENV)
91-
rm -f .peep_installed .dxr_installed
91+
rm -f .requirements_installed .dxr_installed
9292

9393
# Install DXR into the venv. Reinstall it if the setuptools entry points may
9494
# have changed. To install it in non-editable mode, set DXR_PROD=1 in the
@@ -102,7 +102,7 @@ endif
102102
touch $@
103103

104104
# Install Python requirements:
105-
requirements: $(VIRTUAL_ENV)/bin/activate .peep_installed
105+
requirements: $(VIRTUAL_ENV)/bin/activate .requirements_installed
106106

107107
plugins:
108108
$(MAKE) -C dxr/plugins/clang
@@ -120,8 +120,8 @@ dxr/static_unhashed/js/templates.js: dxr/templates/nunjucks/*.html \
120120
touch $@
121121

122122
# Install requirements in current virtualenv:
123-
.peep_installed: $(VIRTUAL_ENV)/bin/activate requirements.txt
124-
$(VIRTUAL_ENV)/bin/python tooling/peep.py install -r requirements.txt
123+
.requirements_installed: $(VIRTUAL_ENV)/bin/activate requirements.txt
124+
$(VIRTUAL_ENV)/bin/pip install --require-hashes -r requirements.txt
125125
touch $@
126126

127127
# Static-file cachebusting:

‎requirements.txt

+65-93
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,65 @@
1-
# sha256: TIMmzrNyf0_3AR1_Ybe8oVzKGU4iiAE6c9XMr1bToYs
2-
# sha256: qw84eyiRKsnDANuENGE1nidz2juSKuN4q2mw2Fsojsg
3-
binaryornot==0.4.0
4-
5-
# sha256: Jo-gDCfedW1xZj3WH3OkqNhydWm7G0dLLOYCBVOCaHI
6-
# sha256: mXhebPcVzc3lne4FpnbpnwSDWnHnztIByjF0AcMiupY
7-
certifi==2015.04.28
8-
9-
# sha256: 5T44s6Sv5tETLeYrdACkrDY0Utxd_PjYjo4MzmY8aKo
10-
# sha256: qvUUveOAILTx5CxqbhQfKCeopYzPw7Irb_WhpLUL5W4
11-
chardet==2.3.0
12-
13-
# sha256: mrHTE_mbIJ-PcaYp82gzAwyNfHIoLPd1aDS69WfcpmI
14-
click==4.0
15-
16-
# sha256: ovVlB3DhyH-zNa8Zqbfrc_wFzPIhROto230AzSvLCQI
17-
configobj==5.0.6
18-
19-
# sha256: hmHkF0e4hcES2UK1KP7D6W4QNrXGcTqmBfL-JLYYRsI
20-
# sha256: kMhZbpZK95ApZS0nNEIDVZkGZxRrghHyQPmci0MrC6w
21-
elasticsearch==1.6.0
22-
23-
# sha256: TIOCn_g9QIteHUmVRyJlQR0sQUESKY8utLNZ2eRWM3M
24-
Flask==0.10.1
25-
26-
# sha256: BK-ioGq33MqdgXF7Qgp6FIJgYemyYUpcd90kx1zPl-Q
27-
# sha256: L-I0K7T-i44hfw0htZIcvlQIv5Ztn5ICXnB-iBsZi-0
28-
futures==3.0.3
29-
30-
# sha256: y7P8-NPjPfhhcJ7K-J2eZinP8KIXvChI8bQc0w02BRk
31-
itsdangerous==0.24
32-
33-
# sha256: LiSsXQBNtXFJdqBKwOgMbfbkfpjDVMssDYL4h51Pj9s
34-
Jinja2==2.7.3
35-
36-
# sha256: pOwa_1m5WhS0XrLiN2GgF56YMZ2lp-t2tW6ozce4ccM
37-
MarkupSafe==0.23
38-
39-
# sha256: 19VXL1qgeX-_IWhEDqpRFJ34hkX-N6-LFfpmDZqBWKA
40-
Mercurial==4.2.1
41-
42-
# sha256: k-YuBcetPaGiM972cx6ChRVnAeNBml_ieQF8Qp7GfOA
43-
more-itertools==2.2
44-
45-
# sha256: HDW0rCBs7y0kgWyJ-Jzyid09OM98RJuz-re_bUPwGx8
46-
ordereddict==1.1
47-
48-
# sha256: Qjri4WBhUEQYq3q_CnQOJqeB-bx2dKbPXi8R7bSugCk
49-
parsimonious==0.6.2
50-
51-
# sha256: J3czd27VOLsv707jyA1xuTCeakPRuJGh39Bs6Sg1l6M
52-
pyelasticsearch==1.4
53-
54-
# sha256: SFYCEplJsUJH6LEk0or0ZU3_vQdlN8SpxEpTiiwXVbc
55-
# sha256: iOTIqRsq9ZYr-l6iRH7G3TVwGOhulMfRS9jKy8W1XYE
56-
Pygments==2.1.3
57-
58-
# sha256: mEFMy7mQkCOXKZaP5CJaMXPj8OwbteW9dmq9drwZqNk
59-
https://github.com/erikrose/schema/archive/99dc4130f0f05fd3c2d4bc6663a2419851f3c90f.zip#egg=schema
60-
61-
# sha256: Y9f3sUog8p90Mlpp5ttFkl6vbjoAPqtGwCNP0FCoyT8
62-
simplejson==3.7.3
63-
64-
# sha256: QYqTw5en7asj5ViNvAZ6x0pyPts9VBvUk295R252Rdo
65-
# sha256: 4kBSQR_E-9H2cmNVN8P8IzDZSBsYwDF2lbRiWVEskdU
66-
six==1.9.0
67-
68-
# sha256: kHGqy9l6mpFQlsGq8NxoSsJnKQTNh221kECF1trJgQ4
69-
tabulate==0.7.5
70-
71-
# sha256: ZBpAwMfRRPA1hMwRv6NwK1N7EDbz3DmhkFzy50HZRdY
72-
# sha256: UhMealYUZvEgbhpkjZpz3aKoBND3DoN4K9iElFQt7Qk
73-
urllib3==1.10.4
74-
75-
# sha256: pDiqjD9ROlzz3aAqYvngIrdZjp-_66FLotbdlXyKtDY
76-
# sha256: nSdx5Mib4Se8S6wFarfOrw4AZMcj1rbhlXOcOvT9XB0
77-
Werkzeug==0.10.4
78-
79-
# sha256: uyTo_df6vGRca0giqfa20IF1End-YHo_-ko4rSI_kgY
80-
funcy==1.1
81-
82-
# sha256: YTZ7nrL0uBn2nqEWdQMFJw8d-IWZksnjVtaoUfJaS0c
83-
ply==3.6
84-
85-
# sha256: C2XnVAXBBJEJIdP2IcCoRLBtKDODWFowmZ8AFtsUYXw
86-
xpidl==1.0
87-
88-
# For deployment script only:
89-
# sha256: FWvz7Ce6nsfgz4--AoCHGAmdIY3kA-tkpxTXO6GimrE
90-
requests==1.2.3
91-
92-
# sha256: aT1u2SplZueIAsegPCVs2jPQjGOtPwD8-hE3mxhLlGI
93-
python-hglib==2.4
1+
binaryornot==0.4.0 \
2+
--hash=sha256:4c8326ceb3727f4ff7011d7f61b7bca15cca194e2288013a73d5ccaf56d3a18b \
3+
--hash=sha256:ab0f387b28912ac9c300db843461359e2773da3b922ae378ab69b0d85b288ec8
4+
certifi==2015.04.28 \
5+
--hash=sha256:268fa00c27de756d71663dd61f73a4a8d8727569bb1b474b2ce6020553826872 \
6+
--hash=sha256:99785e6cf715cdcde59dee05a676e99f04835a71e7ced201ca317401c322ba96
7+
chardet==2.3.0 \
8+
--hash=sha256:e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa \
9+
--hash=sha256:aaf514bde38020b4f1e42c6a6e141f2827a8a58ccfc3b22b6ff5a1a4b50be56e
10+
click==4.0 \
11+
--hash=sha256:9ab1d313f99b209f8f71a629f36833030c8d7c72282cf7756834baf567dca662
12+
configobj==5.0.6 \
13+
--hash=sha256:a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902
14+
elasticsearch==1.6.0 \
15+
--hash=sha256:8661e41747b885c112d942b528fec3e96e1036b5c6713aa605f2fe24b61846c2 \
16+
--hash=sha256:90c8596e964af79029652d2734420355990667146b8211f240f99c8b432b0bac
17+
Flask==0.10.1 \
18+
--hash=sha256:4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373
19+
futures==3.0.3 \
20+
--hash=sha256:04afa2a06ab7dcca9d81717b420a7a14826061e9b2614a5c77dd24c75ccf97e4 \
21+
--hash=sha256:2fe2342bb4fe8b8e217f0d21b5921cbe5408bf966d9f92025e707e881b198bed
22+
itsdangerous==0.24 \
23+
--hash=sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519
24+
Jinja2==2.7.3 \
25+
--hash=sha256:2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb
26+
MarkupSafe==0.23 \
27+
--hash=sha256:a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3
28+
Mercurial==4.2.1 \
29+
--hash=sha256:d7d5572f5aa0797fbf2168440eaa51149df88645fe37af8b15fa660d9a8158a0
30+
more-itertools==2.2 \
31+
--hash=sha256:93e62e05c7ad3da1a233def6731e8285156701e3419a5fe279017c429ec67ce0
32+
ordereddict==1.1 \
33+
--hash=sha256:1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f
34+
parsimonious==0.6.2 \
35+
--hash=sha256:423ae2e16061504418ab7abf0a740e26a781f9bc7674a6cf5e2f11edb4ae8029
36+
pyelasticsearch==1.4 \
37+
--hash=sha256:277733776ed538bb2fef4ee3c80d71b9309e6a43d1b891a1dfd06ce9283597a3
38+
Pygments==2.1.3 \
39+
--hash=sha256:485602129949b14247e8b124d28af4654dffbd076537c4a9c44a538a2c1755b7 \
40+
--hash=sha256:88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81
41+
https://github.com/erikrose/schema/archive/99dc4130f0f05fd3c2d4bc6663a2419851f3c90f.zip#egg=schema \
42+
--hash=sha256:98414ccbb99090239729968fe4225a3173e3f0ec1bb5e5bd766abd76bc19a8d9
43+
simplejson==3.7.3 \
44+
--hash=sha256:63d7f7b14a20f29f74325a69e6db45925eaf6e3a003eab46c0234fd050a8c93f
45+
six==1.9.0 \
46+
--hash=sha256:418a93c397a7edab23e5588dbc067ac74a723edb3d541bd4936f79476e7645da \
47+
--hash=sha256:e24052411fc4fbd1f672635537c3fc2330d9481b18c0317695b46259512c91d5
48+
tabulate==0.7.5 \
49+
--hash=sha256:9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e
50+
urllib3==1.10.4 \
51+
--hash=sha256:641a40c0c7d144f03584cc11bfa3702b537b1036f3dc39a1905cf2e741d945d6 \
52+
--hash=sha256:52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09
53+
Werkzeug==0.10.4 \
54+
--hash=sha256:a438aa8c3f513a5cf3dda02a62f9e022b7598e9fbfeba14ba2d6dd957c8ab436 \
55+
--hash=sha256:9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d
56+
funcy==1.1 \
57+
--hash=sha256:bb24e8fdd7fabc645c6b4822a9f6b6d0817512777e607a3ffa4a38ad223f9206
58+
ply==3.6 \
59+
--hash=sha256:61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47
60+
xpidl==1.0 \
61+
--hash=sha256:0b65e75405c104910921d3f621c0a844b06d283383585a30999f0016db14617c
62+
requests==1.2.3 \
63+
--hash=sha256:156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1
64+
python-hglib==2.4 \
65+
--hash=sha256:693d6ed92a6566e78802c7a03c256cda33d08c63ad3f00fcfa11379b184b9462

0 commit comments

Comments
 (0)