Skip to content

Commit 030769b

Browse files
karthiknadigkarthiknadig
authored
Fix debugger download (#437)
1 parent cbafcd0 commit 030769b

File tree

4 files changed

+102
-47
lines changed

4 files changed

+102
-47
lines changed

Diff for: ‎.vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
// See http://go.microsoft.com/fwlink/?LinkId=827846
33
// for the documentation about the extensions.json format
4-
"recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher"]
4+
"recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher", "charliermarsh.ruff"]
55
}

Diff for: ‎.vscode/settings.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,12 @@
1212
},
1313
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
1414
"typescript.tsc.autoDetect": "off",
15-
"python.linting.flake8Enabled": true,
15+
"[typescript]": {
16+
"editor.defaultFormatter": "esbenp.prettier-vscode",
17+
"editor.formatOnSave": true
18+
},
19+
"[python]": {
20+
"editor.defaultFormatter": "charliermarsh.ruff",
21+
"editor.formatOnSave": true
22+
},
1623
}

Diff for: ‎debugpy_info.json

+64-26
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,70 @@
11
{
2-
"macOS": {
3-
"url": "https://files.pythonhosted.org/packages/ad/72/fd138a10dda16775607316d60dd440fcd23e7560e9276da53c597b5917e9/debugpy-1.8.5-cp311-cp311-macosx_12_0_universal2.whl",
4-
"hash": {
5-
"sha256": "606bccba19f7188b6ea9579c8a4f5a5364ecd0bf5a0659c8a5d0e10dcee3032a"
2+
"macOS": [
3+
{
4+
"url": "https://files.pythonhosted.org/packages/f1/36/0b423f94097cc86555f9a2c8717511863b2a680c9b44b5419d8ac1ff7bf2/debugpy-1.8.5-cp310-cp310-macosx_12_0_x86_64.whl",
5+
"hash": {
6+
"sha256": "7e4d594367d6407a120b76bdaa03886e9eb652c05ba7f87e37418426ad2079f7"
7+
}
8+
},
9+
{
10+
"url": "https://files.pythonhosted.org/packages/ad/72/fd138a10dda16775607316d60dd440fcd23e7560e9276da53c597b5917e9/debugpy-1.8.5-cp311-cp311-macosx_12_0_universal2.whl",
11+
"hash": {
12+
"sha256": "606bccba19f7188b6ea9579c8a4f5a5364ecd0bf5a0659c8a5d0e10dcee3032a"
13+
}
14+
},
15+
{
16+
"url": "https://files.pythonhosted.org/packages/9a/82/7d9e1f75fb23c876ab379008c7cf484a1cfa5ed47ccaac8ba37c75e6814e/debugpy-1.8.5-cp312-cp312-macosx_12_0_universal2.whl",
17+
"hash": {
18+
"sha256": "5b5c770977c8ec6c40c60d6f58cacc7f7fe5a45960363d6974ddb9b62dbee156"
19+
}
620
}
7-
},
8-
"win32": {
9-
"url": "https://files.pythonhosted.org/packages/f6/55/2a1dc192894ba9b368cdcce15315761a00f2d4cd7de4402179648840e480/debugpy-1.8.5-cp311-cp311-win32.whl",
10-
"hash": {
11-
"sha256": "4fbb3b39ae1aa3e5ad578f37a48a7a303dad9a3d018d369bc9ec629c1cfa7408"
21+
],
22+
"win64": [
23+
{
24+
"url": "https://files.pythonhosted.org/packages/38/25/e738d6f782beba924c0e10dfde2061152f1ea3608dff0e5a5bfb30c311e9/debugpy-1.8.5-cp310-cp310-win_amd64.whl",
25+
"hash": {
26+
"sha256": "b78c1250441ce893cb5035dd6f5fc12db968cc07f91cc06996b2087f7cefdd8e"
27+
}
28+
},
29+
{
30+
"url": "https://files.pythonhosted.org/packages/7f/7f/942b23d64f4896e9f8776cf306dfd00feadc950a38d56398610a079b28b1/debugpy-1.8.5-cp311-cp311-win_amd64.whl",
31+
"hash": {
32+
"sha256": "345d6a0206e81eb68b1493ce2fbffd57c3088e2ce4b46592077a943d2b968ca3"
33+
}
34+
},
35+
{
36+
"url": "https://files.pythonhosted.org/packages/f7/be/2fbaffecb063de228b2b3b6a1750b0b745e5dc645eddd52be8b329933c0b/debugpy-1.8.5-cp312-cp312-win_amd64.whl",
37+
"hash": {
38+
"sha256": "28ced650c974aaf179231668a293ecd5c63c0a671ae6d56b8795ecc5d2f48d3c"
39+
}
1240
}
13-
},
14-
"win64": {
15-
"url": "https://files.pythonhosted.org/packages/7f/7f/942b23d64f4896e9f8776cf306dfd00feadc950a38d56398610a079b28b1/debugpy-1.8.5-cp311-cp311-win_amd64.whl",
16-
"hash": {
17-
"sha256": "345d6a0206e81eb68b1493ce2fbffd57c3088e2ce4b46592077a943d2b968ca3"
41+
],
42+
"linux": [
43+
{
44+
"url": "https://files.pythonhosted.org/packages/57/0c/c2ec581541923a4d36cee4fd2419c1211c986849fc61097f87aa81fc6ad3/debugpy-1.8.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
45+
"hash": {
46+
"sha256": "4413b7a3ede757dc33a273a17d685ea2b0c09dbd312cc03f5534a0fd4d40750a"
47+
}
48+
},
49+
{
50+
"url": "https://files.pythonhosted.org/packages/e2/0e/d0e6af2d7bbf5ace847e4d3bd41f8f9d4a0764fcd8058f07a1c51618cbf2/debugpy-1.8.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
51+
"hash": {
52+
"sha256": "db9fb642938a7a609a6c865c32ecd0d795d56c1aaa7a7a5722d77855d5e77f2b"
53+
}
54+
},
55+
{
56+
"url": "https://files.pythonhosted.org/packages/fd/b6/ee71d5e73712daf8307a9e85f5e39301abc8b66d13acd04dfff1702e672e/debugpy-1.8.5-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
57+
"hash": {
58+
"sha256": "c0a65b00b7cdd2ee0c2cf4c7335fef31e15f1b7056c7fdbce9e90193e1a8c8cb"
59+
}
1860
}
19-
},
20-
"linux": {
21-
"url": "https://files.pythonhosted.org/packages/e2/0e/d0e6af2d7bbf5ace847e4d3bd41f8f9d4a0764fcd8058f07a1c51618cbf2/debugpy-1.8.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
22-
"hash": {
23-
"sha256": "db9fb642938a7a609a6c865c32ecd0d795d56c1aaa7a7a5722d77855d5e77f2b"
61+
],
62+
"any": [
63+
{
64+
"url": "https://files.pythonhosted.org/packages/02/49/b595c34d7bc690e8d225a6641618a5c111c7e13db5d9e2b756c15ce8f8c6/debugpy-1.8.5-py2.py3-none-any.whl",
65+
"hash": {
66+
"sha256": "55919dce65b471eff25901acf82d328bbd5b833526b6c1364bd5133754777a44"
67+
}
2468
}
25-
},
26-
"any": {
27-
"url": "https://files.pythonhosted.org/packages/02/49/b595c34d7bc690e8d225a6641618a5c111c7e13db5d9e2b756c15ce8f8c6/debugpy-1.8.5-py2.py3-none-any.whl",
28-
"hash": {
29-
"sha256": "55919dce65b471eff25901acf82d328bbd5b833526b6c1364bd5133754777a44"
30-
}
31-
}
69+
]
3270
}

Diff for: ‎noxfile.py

+29-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33
"""All the action we need during build"""
4+
45
import hashlib
56
import io
67
import json
@@ -75,21 +76,24 @@ def install_bundled_libs(session):
7576
download_url(debugpy_info["any"])
7677

7778

78-
def download_url(value):
79-
with url_lib.urlopen(value["url"]) as response:
80-
data = response.read()
81-
hash_algorithm, hash_value = [
82-
(key, value) for key, value in value["hash"].items()
83-
][0]
84-
if hashlib.new(hash_algorithm, data).hexdigest() != hash_value:
85-
raise ValueError("Failed hash verification for {}.".format(value["url"]))
79+
def download_url(values):
80+
for value in values:
81+
with url_lib.urlopen(value["url"]) as response:
82+
data = response.read()
83+
hash_algorithm, hash_value = [
84+
(key, value) for key, value in value["hash"].items()
85+
][0]
86+
if hashlib.new(hash_algorithm, data).hexdigest() != hash_value:
87+
raise ValueError(
88+
"Failed hash verification for {}.".format(value["url"])
89+
)
8690

87-
print("Download: ", value["url"])
88-
with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
89-
libs_dir = pathlib.Path.cwd() / "bundled" / "libs"
90-
for zip_info in wheel.infolist():
91-
print("\t" + zip_info.filename)
92-
wheel.extract(zip_info.filename, libs_dir)
91+
print("Download: ", value["url"])
92+
with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
93+
libs_dir = pathlib.Path.cwd() / "bundled" / "libs"
94+
for zip_info in wheel.infolist():
95+
print("\t" + zip_info.filename)
96+
wheel.extract(zip_info.filename, libs_dir)
9397

9498

9599
@nox.session()
@@ -141,18 +145,24 @@ def _get_debugpy_info(version="latest", platform="none-any", cp="cp311"):
141145

142146

143147
@nox.session
144-
@nox.parametrize("version", ["1.5.1", "1.7.0", "latest"])
145-
@nox.parametrize("cp", ["cp39", "cp311"])
146-
def create_debugpy_json(session: nox.Session, version, cp):
148+
def create_debugpy_json(session: nox.Session):
147149
platforms = [
148150
("macOS", "macosx"),
149-
("win32", "win32"),
151+
# ("win32", "win32"), # VS Code does not support 32-bit Windows anymore
150152
("win64", "win_amd64"),
151153
("linux", "manylinux"),
152154
("any", "none-any"),
153155
]
154156
debugpy_info_json_path = pathlib.Path(__file__).parent / "debugpy_info.json"
155-
debugpy_info = {p: _get_debugpy_info(version, id, cp) for p, id in platforms}
157+
debugpy_info = {}
158+
for p, id in platforms:
159+
# we typically have the latest 3 versions of debugpy compiled bits
160+
downloads = []
161+
for cp in ["cp310", "cp311", "cp312"]:
162+
data = _get_debugpy_info("latest", id, cp)
163+
if not any(d["url"] == data["url"] for d in downloads):
164+
downloads.append(data)
165+
debugpy_info[p] = downloads
156166
debugpy_info_json_path.write_text(
157167
json.dumps(debugpy_info, indent=4), encoding="utf-8"
158168
)

0 commit comments

Comments
 (0)