Skip to content

top: Update all manifest.py files to use new features from #8914. #9037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

top: Update all manifest.py files to use new features from #8914. #9037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drivers/codec/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("wm8960.py", opt=3)
1 change: 1 addition & 0 deletions drivers/dht/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("dht.py", opt=3)
11 changes: 11 additions & 0 deletions drivers/display/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# TODO: Split these into separate directories with their own manifests.
options.defaults(lcd160cr=False, ssd1306=False, test=True)

if options.lcd160cr:
module("lcd160cr.py", opt=3)

if options.test:
module("lcd160cr.py", opt=3)

if options.ssd1306:
module("ssd1306.py", opt=3)
1 change: 1 addition & 0 deletions drivers/hts221/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("hts221.py", opt=3)
1 change: 1 addition & 0 deletions drivers/lps22h/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("lps22h.py", opt=3)
1 change: 1 addition & 0 deletions drivers/lsm6dsox/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("lsm6dsox.py", opt=3)
1 change: 1 addition & 0 deletions drivers/lsm9ds1/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("lsm9ds1.py", opt=3)
6 changes: 1 addition & 5 deletions drivers/neopixel/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
freeze(
".",
"neopixel.py",
opt=3,
)
module("neopixel.py", opt=3)
1 change: 1 addition & 0 deletions drivers/nrf24l01/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("nrf24l01.py", opt=3)
6 changes: 6 additions & 0 deletions drivers/onewire/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
options.defaults(ds18x20=False)

module("onewire.py", opt=3)

if options.ds18x20:
module("ds18x20.py", opt=3)
1 change: 1 addition & 0 deletions drivers/sdcard/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module("sdcard.py", opt=3)
20 changes: 11 additions & 9 deletions extmod/uasyncio/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# This list of frozen files doesn't include task.py because that's provided by the C module.
freeze(
"..",
# This list of package files doesn't include task.py because that's provided
# by the C module.
package(
"uasyncio",
(
"uasyncio/__init__.py",
"uasyncio/core.py",
"uasyncio/event.py",
"uasyncio/funcs.py",
"uasyncio/lock.py",
"uasyncio/stream.py",
"__init__.py",
"core.py",
"event.py",
"funcs.py",
"lock.py",
"stream.py",
),
base_path="..",
opt=3,
)
3 changes: 2 additions & 1 deletion extmod/webrepl/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
freeze(".", ("webrepl.py", "webrepl_setup.py"))
module("webrepl.py", opt=3)
module("webrepl_setup.py", opt=3)
2 changes: 1 addition & 1 deletion ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(PORT_DIR)/boards/manifest.py")
freeze("modules")

freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
include("$(MPY_DIR)/drivers/display", ssd1306=True)
2 changes: 1 addition & 1 deletion ports/esp32/boards/LOLIN_S2_PICO/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(PORT_DIR)/boards/manifest.py")
freeze("./modules")

freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
include("$(MPY_DIR)/drivers/display", ssd1306=True)
2 changes: 1 addition & 1 deletion ports/esp32/boards/UM_FEATHERS2/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
freeze("$(PORT_DIR)/boards/UM_TINYPICO/modules", "dotstar.py")
module("dotstar.py", base_path="$(PORT_DIR)/boards/UM_TINYPICO/modules", opt=3)
freeze("modules")
15 changes: 8 additions & 7 deletions ports/esp32/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
freeze("$(PORT_DIR)/modules")
freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
freeze("$(MPY_DIR)/extmod", "ntptime.py")
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
freeze("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/neopixel")
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/extmod/webrepl")
9 changes: 4 additions & 5 deletions ports/esp32/boards/manifest_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
include("manifest.py")

freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
require("urequests")
require("upysh")
require("umqtt.simple")
require("umqtt.robust")
22 changes: 10 additions & 12 deletions ports/esp8266/boards/GENERIC/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@
include("$(PORT_DIR)/boards/manifest.py")

# uasyncio
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/extmod/uasyncio")

# drivers
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
include("$(MPY_DIR)/drivers/display", ssd1306=True)

# 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")
# file utilities
require("upysh")

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

# umqtt
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
# umqtt
require("umqtt.simple")
require("umqtt.robust")
13 changes: 8 additions & 5 deletions ports/esp8266/boards/GENERIC_512K/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
freeze("$(BOARD_DIR)", "_boot.py", opt=3)
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
freeze("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
module("_boot.py", opt=3)
module("apa102.py", base_path="modules", opt=3)
module("port_diag.py", base_path="modules", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl")
include("$(MPY_DIR)/drivers/neopixel")
13 changes: 7 additions & 6 deletions ports/esp8266/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
freeze("$(PORT_DIR)/modules")
freeze("$(MPY_DIR)/extmod", "ntptime.py")
freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
freeze("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl")
include("$(MPY_DIR)/drivers/neopixel")
11 changes: 4 additions & 7 deletions ports/mimxrt/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
freeze("$(PORT_DIR)/modules")
freeze("$(MPY_DIR)/drivers/onewire")
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
try:
include("$(BOARD_DIR)/manifest.py")
except FileNotFoundError:
pass
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/extmod/uasyncio")
include_maybe("$(BOARD_DIR)/manifest.py")
6 changes: 3 additions & 3 deletions ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(PORT_DIR)/modules/manifest.py")
freeze("$(MPY_DIR)/drivers/hts221", "hts221.py")
freeze("$(MPY_DIR)/drivers/lps22h", "lps22h.py")
freeze("$(MPY_DIR)/drivers/lsm9ds1", "lsm9ds1.py")
include("$(MPY_DIR)/drivers/hts221")
include("$(MPY_DIR)/drivers/lps22h")
include("$(MPY_DIR)/drivers/lsm9ds1")
4 changes: 2 additions & 2 deletions ports/nrf/modules/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
freeze("$(PORT_DIR)/modules/scripts", "_mkfs.py")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
module("_mkfs.py", base_path="$(PORT_DIR)/modules/scripts", opt=3)
include("$(MPY_DIR)/extmod/uasyncio")
2 changes: 1 addition & 1 deletion ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# We do not want to include default frozen modules,
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
include("$(MPY_DIR)/drivers/sdcard")
2 changes: 1 addition & 1 deletion ports/renesas-ra/boards/RA4M1_EK/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# We do not want to include default frozen modules,
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
include("$(MPY_DIR)/drivers/sdcard")
8 changes: 4 additions & 4 deletions ports/renesas-ra/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
include("$(MPY_DIR)/drivers/sdcard")
21 changes: 10 additions & 11 deletions ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
include("$(PORT_DIR)/boards/manifest.py")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
freeze("$(MPY_DIR)/drivers/lsm6dsox/", "lsm6dsox.py")
include(
"$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
client=True,
central=True,
l2cap=True,
security=True,
)
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

# Networking
include("$(MPY_DIR)/extmod/webrepl")
require("urequests")

# Drivers
include("$(MPY_DIR)/drivers/lsm6dsox")

# Bluetooth
require("aioble", client=True, central=True, l2cap=True, security=True)
9 changes: 4 additions & 5 deletions ports/rp2/boards/PICO_W/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
include("../manifest.py")

freeze("$(MPY_DIR)/tools", "upip.py")
freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
freeze("$(MPY_DIR)/extmod", "ntptime.py")
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)

if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
require("urequests")
8 changes: 4 additions & 4 deletions ports/rp2/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
freeze("$(PORT_DIR)/modules")
freeze("$(MPY_DIR)/drivers/onewire")
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/drivers/neopixel")
10 changes: 2 additions & 8 deletions ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include(
"$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
client=True,
central=True,
l2cap=True,
security=True,
)
include("$(MPY_DIR)/extmod/webrepl")
require("aioble", client=True, central=True, l2cap=True, security=True)
2 changes: 1 addition & 1 deletion ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
# Note: Freezes to display.ssd1306, so must use deprecated "freeze" function.
freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
2 changes: 2 additions & 0 deletions ports/stm32/boards/LEGO_HUB_NO6/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Shared manifest for LEGO_HUB_NO6 & LEGO_HUB_NO7.

include("$(PORT_DIR)/boards/manifest.py")

# Modules for application firmware update.
Expand Down
7 changes: 2 additions & 5 deletions ports/stm32/boards/LEGO_HUB_NO7/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
include("$(PORT_DIR)/boards/manifest.py")

# Modules for application firmware update.
freeze("$(PORT_DIR)/mboot", "fwupdate.py", opt=3)
freeze("$(PORT_DIR)/boards/LEGO_HUB_NO6", ("spiflash.py", "appupdate.py"), opt=3)
# Use shared manifest.
include("$(PORT_DIR)/boards/LEGO_HUB_NO6")
2 changes: 1 addition & 1 deletion ports/stm32/boards/PYBD_SF2/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include("$(PORT_DIR)/boards/manifest.py")
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include("$(MPY_DIR)/extmod/webrepl")
9 changes: 5 additions & 4 deletions ports/stm32/boards/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
freeze("$(MPY_DIR)/drivers/display", ("lcd160cr.py", "lcd160cr_test.py"))
freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
include("$(MPY_DIR)/extmod/uasyncio")

include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
2 changes: 1 addition & 1 deletion ports/unix/variants/dev/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include("$(PORT_DIR)/variants/manifest.py")

include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/extmod/uasyncio")
4 changes: 2 additions & 2 deletions ports/unix/variants/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
freeze_as_mpy("$(MPY_DIR)/tools", "upip.py")
freeze_as_mpy("$(MPY_DIR)/tools", "upip_utarfile.py", opt=3)
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
2 changes: 1 addition & 1 deletion ports/windows/variants/dev/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include("$(PORT_DIR)/variants/manifest.py")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/extmod/uasyncio")