top: Use micropython-lib unconditionally in manifests.

jimmo · jimmo · commit da7f2537a124 · 2022-09-05T17:00:43.000+10:00
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 &lt;jim.mussared@gmail.com&gt;
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
@@ -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")
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -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")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,4 @@`
`8`	`8`	`l2cap=True,`
`9`	`9`	`security=True,`
`10`	`10`	`)`
`11`		`-if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):`
`12`		`- freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")`
	`11`	`+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")`