Skip to content

Commit

Permalink
top: Use micropython-lib unconditionally in manifests.
Browse files Browse the repository at this point in the history
micropython-lib is now a submodule, and the manifest compilation process
will ensure it is available, so manifests no longer need to check that it
is available.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
  • Loading branch information
jimmo committed Sep 5, 2022
1 parent 0b26efe commit da7f253
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
18 changes: 8 additions & 10 deletions ports/esp8266/boards/GENERIC/manifest.py
Expand Up @@ -7,15 +7,13 @@
# drivers
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")

# Libraries from micropython-lib, include only if the library directory exists
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
# file utilities
freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
# micropython-lib: file utilities
freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")

# requests
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
# micropython-lib: requests
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")

# umqtt
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
# micropython-lib: umqtt
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
3 changes: 1 addition & 2 deletions ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
Expand Up @@ -8,5 +8,4 @@
l2cap=True,
security=True,
)
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
3 changes: 1 addition & 2 deletions ports/rp2/boards/PICO_W/manifest.py
Expand Up @@ -4,5 +4,4 @@
freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
freeze("$(MPY_DIR)/extmod", "ntptime.py")

if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

0 comments on commit da7f253

Please sign in to comment.