TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/mpremote: Support mip install from package.json on local fs.

Browse Source 
Add support for `mpremote mip install package.json` where `package.json` is
a json file on the local filesystem.

Without this, package json files can only be loaded from http, https,
github or gitlab URLs.

This is useful for testing `package.json` files for pacages in development
and for constructing one's own `package.json` files for Python packages
which are not yet available for installation using mip.

Signed-off-by: Glenn Moloney <glenn.moloney@gmail.com>
This commit is contained in:
Glenn Moloney
2023-09-19 11:41:46 +10:00
committed by Damien George
parent 752c1672af
commit 11c9656fad
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/mpremote/mpremote/mip.py
View File

@@ -13,6 +13,8 @@ from .commands import CommandError, show_progress_bar
_PACKAGE_INDEX = "https://micropython.org/pi/v2" _PACKAGE_INDEX = "https://micropython.org/pi/v2"
allowed_mip_url_prefixes = ("http://", "https://", "github:", "gitlab:")
# This implements os.makedirs(os.dirname(path)) # This implements os.makedirs(os.dirname(path))
def _ensure_path_exists(transport, path): def _ensure_path_exists(transport, path):
@@ -78,16 +80,25 @@ def _download_file(transport, url, dest):
def _install_json(transport, package_json_url, index, target, version, mpy): def _install_json(transport, package_json_url, index, target, version, mpy):
try: if package_json_url.startswith(allowed_mip_url_prefixes):
with urllib.request.urlopen(_rewrite_url(package_json_url, version)) as response: try:
package_json = json.load(response) with urllib.request.urlopen(_rewrite_url(package_json_url, version)) as response:
except urllib.error.HTTPError as e: package_json = json.load(response)
if e.status == 404: except urllib.error.HTTPError as e:
raise CommandError(f"Package not found: {package_json_url}") if e.status == 404:
else: raise CommandError(f"Package not found: {package_json_url}")
raise CommandError(f"Error {e.status} requesting {package_json_url}") else:
except urllib.error.URLError as e: raise CommandError(f"Error {e.status} requesting {package_json_url}")
raise CommandError(f"{e.reason} requesting {package_json_url}") except urllib.error.URLError as e:
raise CommandError(f"{e.reason} requesting {package_json_url}")
elif package_json_url.endswith(".json"):
try:
with open(package_json_url, "r") as f:
package_json = json.load(f)
except OSError:
raise CommandError(f"Error opening {package_json_url}")
else:
raise CommandError(f"Invalid url for package: {package_json_url}")
for target_path, short_hash in package_json.get("hashes", ()): for target_path, short_hash in package_json.get("hashes", ()):
fs_target_path = target + "/" + target_path fs_target_path = target + "/" + target_path
file_url = f"{index}/file/{short_hash[:2]}/{short_hash}" file_url = f"{index}/file/{short_hash[:2]}/{short_hash}"
@@ -100,12 +111,7 @@ def _install_json(transport, package_json_url, index, target, version, mpy):
def _install_package(transport, package, index, target, version, mpy): def _install_package(transport, package, index, target, version, mpy):
if ( if package.startswith(allowed_mip_url_prefixes):
package.startswith("http://")
or package.startswith("https://")
or package.startswith("github:")
or package.startswith("gitlab:")
):
if package.endswith(".py") or package.endswith(".mpy"): if package.endswith(".py") or package.endswith(".mpy"):
print(f"Downloading {package} to {target}") print(f"Downloading {package} to {target}")
_download_file( _download_file(
@@ -118,6 +124,8 @@ def _install_package(transport, package, index, target, version, mpy):
package += "/" package += "/"
package += "package.json" package += "package.json"
print(f"Installing {package} to {target}") print(f"Installing {package} to {target}")
elif package.endswith(".json"):
pass
else: else:
if not version: if not version:
version = "latest" version = "latest"