Fix pr comments

paulacamargo25 · paulacamargo25 · commit 18908fa07664 · 2023-09-25T15:29:35.000-07:00
diff --git a/noxfile.py b/noxfile.py
@@ -12,49 +12,45 @@
 
 import nox  # pylint: disable=import-error
 
-debugpy_urls = {
+DEBUGPY_WHEEL_URLS = {
     "any": {
         "url": "https://files.pythonhosted.org/packages/39/2f/c8a8cfac6c7fa3d9e163a6bf46e6d27d027b7a1331028e99a6ef7fd3699d/debugpy-1.7.0-py2.py3-none-any.whl",
-        "hash": "f6de2e6f24f62969e0f0ef682d78c98161c4dca29e9fb05df4d2989005005502",
+        "hash": (
+            "sha256",
+            "f6de2e6f24f62969e0f0ef682d78c98161c4dca29e9fb05df4d2989005005502",
+        ),
     },
     "macOS": {
         "url": "https://files.pythonhosted.org/packages/bd/a3/5e37ce13c7dd850b72a52be544a058ed49606ebbbf8b95b2ba3c1db5620a/debugpy-1.7.0-cp311-cp311-macosx_11_0_universal2.whl",
-        "hash": "538765a41198aa88cc089295b39c7322dd598f9ef1d52eaae12145c63bf9430a",
+        "sha256": (
+            "sha256",
+            "538765a41198aa88cc089295b39c7322dd598f9ef1d52eaae12145c63bf9430a",
+        ),
     },
     "linux": {
         "url": "https://files.pythonhosted.org/packages/b4/fc/087324d46dab8e21e084ce2cf670fa7e524ab5e7691692438e4987bd3ecb/debugpy-1.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
-        "hash": "c7e8cf91f8f3f9b5fad844dd88427b85d398bda1e2a0cd65d5a21312fcbc0c6f",
+        "hash": (
+            "sha256",
+            "c7e8cf91f8f3f9b5fad844dd88427b85d398bda1e2a0cd65d5a21312fcbc0c6f",
+        ),
     },
     "win32": {
         "url": "https://files.pythonhosted.org/packages/52/59/3591e9f709b7ee4d3a926a8903a395669cd0e0279204a94b6acccf6ed6ee/debugpy-1.7.0-cp311-cp311-win32.whl",
-        "hash": "18a69f8e142a716310dd0af6d7db08992aed99e2606108732efde101e7c65e2a",
+        "hash": (
+            "sha256",
+            "18a69f8e142a716310dd0af6d7db08992aed99e2606108732efde101e7c65e2a",
+        ),
     },
     "win64": {
         "url": "https://files.pythonhosted.org/packages/51/59/84ebd58d3e9de33a54ca8aa4532e03906e5458092dafe240264c2937a99b/debugpy-1.7.0-cp311-cp311-win_amd64.whl",
-        "hash": "7515a5ba5ee9bfe956685909c5f28734c1cecd4ee813523363acfe3ca824883a",
+        "hash": (
+            "sha256",
+            "7515a5ba5ee9bfe956685909c5f28734c1cecd4ee813523363acfe3ca824883a",
+        ),
     },
 }
 
 
-def _install_bundle(session: nox.Session) -> None:
-    session.install(
-        "-t",
-        "./bundled/libs",
-        "--no-cache-dir",
-        "--implementation",
-        "py",
-        "--no-deps",
-        "--upgrade",
-        "-r",
-        "./requirements.txt",
-    )
-    session.install("packaging")
-
-
-def _update_pip_packages(session: nox.Session) -> None:
-    session.run("pip-compile", "--generate-hashes", "--upgrade", "./requirements.in")
-
-
 @nox.session()
 def lint(session: nox.Session) -> None:
     """Runs linter and formatter checks on python files."""
@@ -81,152 +77,50 @@ def tests(session: nox.Session) -> None:
     session.run("npm", "run", "test")
 
 
-def _get_package_data(package):
-    json_uri = f"https://registry.npmjs.org/{package}"
-    with url_lib.urlopen(json_uri) as response:
-        return json.loads(response.read())
-
-
-def _update_npm_packages(session: nox.Session) -> None:
-    pinned = {
-        "vscode-languageclient",
-        "@types/vscode",
-        "@types/node",
-    }
-    package_json_path = pathlib.Path(__file__).parent / "package.json"
-    package_json = json.loads(package_json_path.read_text(encoding="utf-8"))
-
-    for package in package_json["dependencies"]:
-        if package not in pinned:
-            data = _get_package_data(package)
-            latest = "^" + data["dist-tags"]["latest"]
-            package_json["dependencies"][package] = latest
-
-    for package in package_json["devDependencies"]:
-        if package not in pinned:
-            data = _get_package_data(package)
-            latest = "^" + data["dist-tags"]["latest"]
-            package_json["devDependencies"][package] = latest
-
-    # Ensure engine matches the package
-    if (
-        package_json["engines"]["vscode"]
-        != package_json["devDependencies"]["@types/vscode"]
-    ):
-        print(
-            "Please check VS Code engine version and @types/vscode version in package.json."
-        )
-
-    new_package_json = json.dumps(package_json, indent=4)
-    # JSON dumps uses \n for line ending on all platforms by default
-    if not new_package_json.endswith("\n"):
-        new_package_json += "\n"
-    package_json_path.write_text(new_package_json, encoding="utf-8")
-
-    session.run("npm", "audit", "fix", external=True)
-    session.run("npm", "install", external=True)
-
-
-def _setup_template_environment(session: nox.Session) -> None:
-    session.install("wheel", "pip-tools")
-    _update_pip_packages(session)
-    _install_bundle(session)
-
-
-@nox.session(python="3.7")
+@nox.session()
 def install_bundled_libs(session):
-    # Install debugpy by url and platform
+    # Install debugpy by URL and platform
     """Installs the libraries that will be bundled with the extension."""
     session.install("wheel")
-    _install_bundle(session)
+    session.install(
+        "-t",
+        "./bundled/libs",
+        "--no-cache-dir",
+        "--implementation",
+        "py",
+        "--no-deps",
+        "--upgrade",
+        "-r",
+        "./requirements.txt",
+    )
+    session.install("packaging")
 
     target = os.environ.get("VSCETARGET", "")
     print("target:", target)
     if "darwin" in target:
-        download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["macOS"])
+        download_url(DEBUGPY_WHEEL_URLS["macOS"])
     elif "win32-ia32" == target:
-        download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["win32"])
+        download_url(DEBUGPY_WHEEL_URLS["win32"])
     elif "win32-x64" == target:
-        download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["win64"])
+        download_url(DEBUGPY_WHEEL_URLS["win64"])
     elif "linux-x64" == target:
-        download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["linux"])
+        download_url(DEBUGPY_WHEEL_URLS["linux"])
     else:
-        download_url(f"{os.getcwd()}/bundled/libs", debugpy_urls["any"])
+        download_url(DEBUGPY_WHEEL_URLS["any"])
 
 
-@nox.session(python="3.7")
-def setup(session: nox.Session) -> None:
-    """Sets up the extension for development."""
-    _setup_template_environment(session)
-
-
-@nox.session()
-def update_packages(session: nox.Session) -> None:
-    """Update pip and npm packages."""
-    session.install("wheel", "pip-tools")
-    _update_pip_packages(session)
-    _update_npm_packages(session)
-
-
-def _contains(s, parts=()):
-    return any(p for p in parts if p in s)
-
-
-def _get_pypi_package_data(package_name):
-    json_uri = "https://pypi.org/pypi/{0}/json".format(package_name)
-    # Response format: https://warehouse.readthedocs.io/api-reference/json/#project
-    # Release metadata format: https://github.com/pypa/interoperability-peps/blob/master/pep-0426-core-metadata.rst
-    with url_lib.urlopen(json_uri) as response:
-        return json.loads(response.read())
-
-
-def _get_urls(data, version):
-    return list(
-        r["url"] for r in data["releases"][version] if _contains(r["url"], ("cp310",))
-    )
-
-
-def download_url(root, value):
+def download_url(value):
     with url_lib.urlopen(value["url"]) as response:
         data = response.read()
-        if hashlib.sha256(data).hexdigest() == value["hash"]:
-            print("Download: ", value["url"])
-            with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
-                for zip_info in wheel.infolist():
-                    # Ignore dist info since we are merging multiple wheels
-                    if ".dist-info/" in zip_info.filename:
-                        continue
-                    print("\t" + zip_info.filename)
-                    wheel.extract(zip_info.filename, root)
-
-
-def _download_and_extract(root, url):
-    if "manylinux" in url or "macosx" in url or "win_amd64" in url:
-        root = os.getcwd() if root is None or root == "." else root
-        print(url)
-        with url_lib.urlopen(url) as response:
-            data = response.read()
-            with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
-                for zip_info in wheel.infolist():
-                    # Ignore dist info since we are merging multiple wheels
-                    if ".dist-info/" in zip_info.filename:
-                        continue
-                    print("\t" + zip_info.filename)
-                    wheel.extract(zip_info.filename, root)
-
-
-def _install_package(root, package_name, version="latest"):
-    from packaging.version import parse as version_parser
-
-    data = _get_pypi_package_data(package_name)
-
-    if version == "latest":
-        use_version = max(data["releases"].keys(), key=version_parser)
-    else:
-        use_version = version
-
-    for url in _get_urls(data, use_version):
-        _download_and_extract(root, url)
+        if hashlib.sha256(data).hexdigest() != value["hash"][1]:
+            raise Exception("Failed hash verification for {}.".format(value["url"]))
+        print("Download: ", value["url"])
+        with zipfile.ZipFile(io.BytesIO(data), "r") as wheel:
+            for zip_info in wheel.infolist():
+                print("\t" + zip_info.filename)
+                wheel.extract(
+                    zip_info.filename, pathlib.Path.cwd() / "bundled" / "libs"
+                )
 
 
 @nox.session()
