diff --git a/pyproject.toml b/pyproject.toml index 1929a136..2684138e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ repo-path = "./repos" [tool.poetry] name = "micropython-stubber" -version = "1.16.2" +version = "1.16.3" description = "Tooling to create and maintain stubs for MicroPython" authors = ["Jos Verlinde "] license = "MIT" diff --git a/scripts/get_firmwares.ipynb b/scripts/get_firmwares.ipynb index d97be2bd..3316143c 100644 --- a/scripts/get_firmwares.ipynb +++ b/scripts/get_firmwares.ipynb @@ -101,7 +101,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Found 169 firmwares\n" + "Found 186 firmwares\n" ] } ], @@ -178,18 +178,115 @@ } ], "source": [ - "relevant = [3````````````````\n", + "relevant = [\n", + " board\n", + " for board in board_urls\n", + " if board[\"board\"] in RELEVANT_BOARDS and (board[\"version\"] in [\"1.22.0\", \"1.22.1\"] or board[\"preview\"])\n", " # and b[\"port\"] in [\"esp32\", \"rp2\"]\n", "]\n", + "\n", "# relevant\n", + "\n", "print(f\"Found {len(relevant)} relevant firmwares\")" ] }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 7, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Downloading https://micropython.org/resources/firmware/PYBV11-20240105-v1.22.1.hex to firmware\\stm32\\PYBV11-v1.22.1.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-20240124-v1.23.0-preview.62.g6bb446b7f.hex to firmware\\stm32\\PYBV11-v1.23.0-preview.62.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-20240123-v1.23.0-preview.60.gce2058685.hex to firmware\\stm32\\PYBV11-v1.23.0-preview.60.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-20240123-v1.23.0-preview.59.g057701a77.hex to firmware\\stm32\\PYBV11-v1.23.0-preview.59.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-20240123-v1.23.0-preview.58.gc3ca3612d.hex to firmware\\stm32\\PYBV11-v1.23.0-preview.58.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP-20240105-v1.22.1.hex to firmware\\stm32\\PYBV11-DP-v1.22.1.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP-20240124-v1.23.0-preview.62.g6bb446b7f.hex to firmware\\stm32\\PYBV11-DP-v1.23.0-preview.62.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP-20240123-v1.23.0-preview.60.gce2058685.hex to firmware\\stm32\\PYBV11-DP-v1.23.0-preview.60.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP-20240123-v1.23.0-preview.59.g057701a77.hex to firmware\\stm32\\PYBV11-DP-v1.23.0-preview.59.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP-20240123-v1.23.0-preview.58.gc3ca3612d.hex to firmware\\stm32\\PYBV11-DP-v1.23.0-preview.58.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-NETWORK-20240105-v1.22.1.hex to firmware\\stm32\\PYBV11-NETWORK-v1.22.1.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-NETWORK-20240124-v1.23.0-preview.62.g6bb446b7f.hex to firmware\\stm32\\PYBV11-NETWORK-v1.23.0-preview.62.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-NETWORK-20240123-v1.23.0-preview.60.gce2058685.hex to firmware\\stm32\\PYBV11-NETWORK-v1.23.0-preview.60.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-NETWORK-20240123-v1.23.0-preview.59.g057701a77.hex to firmware\\stm32\\PYBV11-NETWORK-v1.23.0-preview.59.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-NETWORK-20240123-v1.23.0-preview.58.gc3ca3612d.hex to firmware\\stm32\\PYBV11-NETWORK-v1.23.0-preview.58.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-THREAD-20240105-v1.22.1.hex to firmware\\stm32\\PYBV11-THREAD-v1.22.1.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-THREAD-20240124-v1.23.0-preview.62.g6bb446b7f.hex to firmware\\stm32\\PYBV11-THREAD-v1.23.0-preview.62.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-THREAD-20240123-v1.23.0-preview.60.gce2058685.hex to firmware\\stm32\\PYBV11-THREAD-v1.23.0-preview.60.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-THREAD-20240123-v1.23.0-preview.59.g057701a77.hex to firmware\\stm32\\PYBV11-THREAD-v1.23.0-preview.59.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-THREAD-20240123-v1.23.0-preview.58.gc3ca3612d.hex to firmware\\stm32\\PYBV11-THREAD-v1.23.0-preview.58.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP_THREAD-20240105-v1.22.1.hex to firmware\\stm32\\PYBV11-DP_THREAD-v1.22.1.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP_THREAD-20240124-v1.23.0-preview.62.g6bb446b7f.hex to firmware\\stm32\\PYBV11-DP_THREAD-v1.23.0-preview.62.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP_THREAD-20240123-v1.23.0-preview.60.gce2058685.hex to firmware\\stm32\\PYBV11-DP_THREAD-v1.23.0-preview.60.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP_THREAD-20240123-v1.23.0-preview.59.g057701a77.hex to firmware\\stm32\\PYBV11-DP_THREAD-v1.23.0-preview.59.hex\n", + "Downloading https://micropython.org/resources/firmware/PYBV11-DP_THREAD-20240123-v1.23.0-preview.58.gc3ca3612d.hex to firmware\\stm32\\PYBV11-DP_THREAD-v1.23.0-preview.58.hex\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-UNICORE-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC-UNICORE-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-UNICORE-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC-UNICORE-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-UNICORE-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC-UNICORE-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-UNICORE-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC-UNICORE-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-UNICORE-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC-UNICORE-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-OTA-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC-OTA-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-OTA-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC-OTA-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-OTA-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC-OTA-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-OTA-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC-OTA-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-OTA-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC-OTA-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-D2WD-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC-D2WD-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-D2WD-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC-D2WD-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-D2WD-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC-D2WD-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-D2WD-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC-D2WD-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-D2WD-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC-D2WD-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-SPIRAM-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC-SPIRAM-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-SPIRAM-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC-SPIRAM-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-SPIRAM-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC-SPIRAM-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-SPIRAM-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC-SPIRAM-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC-SPIRAM-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC-SPIRAM-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC_S3-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC_S3-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC_S3-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC_S3-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC_S3-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-SPIRAM_OCT-20240105-v1.22.1.bin to firmware\\esp32\\ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.1.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-SPIRAM_OCT-20240124-v1.23.0-preview.62.g6bb446b7f.bin to firmware\\esp32\\ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.62.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-SPIRAM_OCT-20240123-v1.23.0-preview.60.gce2058685.bin to firmware\\esp32\\ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.60.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-SPIRAM_OCT-20240123-v1.23.0-preview.59.g057701a77.bin to firmware\\esp32\\ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.59.bin\n", + "Downloading https://micropython.org/resources/firmware/ESP32_GENERIC_S3-SPIRAM_OCT-20240123-v1.23.0-preview.58.gc3ca3612d.bin to firmware\\esp32\\ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.58.bin\n", + "Downloading https://micropython.org/resources/firmware/ARDUINO_NANO_RP2040_CONNECT-20240105-v1.22.1.uf2 to firmware\\rp2\\ARDUINO_NANO_RP2040_CONNECT-v1.22.1.uf2\n", + "Downloading https://micropython.org/resources/firmware/ARDUINO_NANO_RP2040_CONNECT-20240124-v1.23.0-preview.62.g6bb446b7f.uf2 to firmware\\rp2\\ARDUINO_NANO_RP2040_CONNECT-v1.23.0-preview.62.uf2\n", + "Downloading https://micropython.org/resources/firmware/ARDUINO_NANO_RP2040_CONNECT-20240123-v1.23.0-preview.60.gce2058685.uf2 to firmware\\rp2\\ARDUINO_NANO_RP2040_CONNECT-v1.23.0-preview.60.uf2\n", + "Downloading https://micropython.org/resources/firmware/ARDUINO_NANO_RP2040_CONNECT-20240123-v1.23.0-preview.59.g057701a77.uf2 to firmware\\rp2\\ARDUINO_NANO_RP2040_CONNECT-v1.23.0-preview.59.uf2\n", + "Downloading https://micropython.org/resources/firmware/ARDUINO_NANO_RP2040_CONNECT-20240123-v1.23.0-preview.58.gc3ca3612d.uf2 to firmware\\rp2\\ARDUINO_NANO_RP2040_CONNECT-v1.23.0-preview.58.uf2\n", + "Downloading https://micropython.org/resources/firmware/PIMORONI_PICOLIPO_16MB-20240105-v1.22.1.uf2 to firmware\\rp2\\PIMORONI_PICOLIPO_16MB-v1.22.1.uf2\n", + "Downloading https://micropython.org/resources/firmware/PIMORONI_PICOLIPO_16MB-20240124-v1.23.0-preview.62.g6bb446b7f.uf2 to firmware\\rp2\\PIMORONI_PICOLIPO_16MB-v1.23.0-preview.62.uf2\n", + "Downloading https://micropython.org/resources/firmware/PIMORONI_PICOLIPO_16MB-20240123-v1.23.0-preview.60.gce2058685.uf2 to firmware\\rp2\\PIMORONI_PICOLIPO_16MB-v1.23.0-preview.60.uf2\n", + "Downloading https://micropython.org/resources/firmware/PIMORONI_PICOLIPO_16MB-20240123-v1.23.0-preview.59.g057701a77.uf2 to firmware\\rp2\\PIMORONI_PICOLIPO_16MB-v1.23.0-preview.59.uf2\n", + "Downloading https://micropython.org/resources/firmware/PIMORONI_PICOLIPO_16MB-20240123-v1.23.0-preview.58.gc3ca3612d.uf2 to firmware\\rp2\\PIMORONI_PICOLIPO_16MB-v1.23.0-preview.58.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO-20240105-v1.22.1.uf2 to firmware\\rp2\\RPI_PICO-v1.22.1.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO-20240124-v1.23.0-preview.62.g6bb446b7f.uf2 to firmware\\rp2\\RPI_PICO-v1.23.0-preview.62.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO-20240123-v1.23.0-preview.60.gce2058685.uf2 to firmware\\rp2\\RPI_PICO-v1.23.0-preview.60.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO-20240123-v1.23.0-preview.59.g057701a77.uf2 to firmware\\rp2\\RPI_PICO-v1.23.0-preview.59.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO-20240123-v1.23.0-preview.58.gc3ca3612d.uf2 to firmware\\rp2\\RPI_PICO-v1.23.0-preview.58.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO_W-20240105-v1.22.1.uf2 to firmware\\rp2\\RPI_PICO_W-v1.22.1.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO_W-20240124-v1.23.0-preview.62.g6bb446b7f.uf2 to firmware\\rp2\\RPI_PICO_W-v1.23.0-preview.62.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO_W-20240123-v1.23.0-preview.60.gce2058685.uf2 to firmware\\rp2\\RPI_PICO_W-v1.23.0-preview.60.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO_W-20240123-v1.23.0-preview.59.g057701a77.uf2 to firmware\\rp2\\RPI_PICO_W-v1.23.0-preview.59.uf2\n", + "Downloading https://micropython.org/resources/firmware/RPI_PICO_W-20240123-v1.23.0-preview.58.gc3ca3612d.uf2 to firmware\\rp2\\RPI_PICO_W-v1.23.0-preview.58.uf2\n", + "Downloading https://micropython.org/resources/firmware/SEEED_WIO_TERMINAL-20240105-v1.22.1.uf2 to firmware\\samd\\SEEED_WIO_TERMINAL-v1.22.1.uf2\n", + "Downloading https://micropython.org/resources/firmware/SEEED_WIO_TERMINAL-20240124-v1.23.0-preview.62.g6bb446b7f.uf2 to firmware\\samd\\SEEED_WIO_TERMINAL-v1.23.0-preview.62.uf2\n", + "Downloading https://micropython.org/resources/firmware/SEEED_WIO_TERMINAL-20240123-v1.23.0-preview.60.gce2058685.uf2 to firmware\\samd\\SEEED_WIO_TERMINAL-v1.23.0-preview.60.uf2\n", + "Downloading https://micropython.org/resources/firmware/SEEED_WIO_TERMINAL-20240123-v1.23.0-preview.59.g057701a77.uf2 to firmware\\samd\\SEEED_WIO_TERMINAL-v1.23.0-preview.59.uf2\n", + "Downloading https://micropython.org/resources/firmware/SEEED_WIO_TERMINAL-20240123-v1.23.0-preview.58.gc3ca3612d.uf2 to firmware\\samd\\SEEED_WIO_TERMINAL-v1.23.0-preview.58.uf2\n" + ] + } + ], "source": [ "# download the relevant files to the firmware folder\n", "import requests\n", @@ -219,7 +316,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 8, "metadata": {}, "outputs": [ { @@ -234,7 +331,7 @@ "\n", " Directory of c:\\develop\\MyPython\\micropython-stubber\\scripts\\firmware\\esp32\n", "\n", - "03-01-2024 11:55 .\n", + "25-01-2024 00:00 .\n", "19-10-2023 14:24 ..\n", "19-10-2023 14:45 1.494.672 ESP32_GENERIC-D2WD-v1.21.0.bin\n", "19-10-2023 14:45 1.494.832 ESP32_GENERIC-D2WD-v1.22.0-preview.27.bin\n", @@ -246,7 +343,12 @@ "19-10-2023 14:45 1.494.832 ESP32_GENERIC-D2WD-v1.22.0-preview.31.bin\n", "19-10-2023 14:45 1.494.832 ESP32_GENERIC-D2WD-v1.22.0-preview.32.bin\n", "30-12-2023 00:28 1.494.112 ESP32_GENERIC-D2WD-v1.22.0.bin\n", + "25-01-2024 00:00 1.494.112 ESP32_GENERIC-D2WD-v1.22.1.bin\n", + "25-01-2024 00:00 1.494.320 ESP32_GENERIC-D2WD-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.494.320 ESP32_GENERIC-D2WD-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.494.144 ESP32_GENERIC-D2WD-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.494.320 ESP32_GENERIC-D2WD-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.494.320 ESP32_GENERIC-D2WD-v1.23.0-preview.62.bin\n", "19-10-2023 14:45 1.621.792 ESP32_GENERIC-OTA-v1.21.0.bin\n", "19-10-2023 14:45 1.621.936 ESP32_GENERIC-OTA-v1.22.0-preview.27.bin\n", "30-12-2023 00:28 1.544.848 ESP32_GENERIC-OTA-v1.22.0-preview.278.bin\n", @@ -257,7 +359,12 @@ "19-10-2023 14:45 1.621.952 ESP32_GENERIC-OTA-v1.22.0-preview.31.bin\n", "19-10-2023 14:45 1.621.952 ESP32_GENERIC-OTA-v1.22.0-preview.32.bin\n", "30-12-2023 00:28 1.545.088 ESP32_GENERIC-OTA-v1.22.0.bin\n", + "25-01-2024 00:00 1.545.088 ESP32_GENERIC-OTA-v1.22.1.bin\n", + "25-01-2024 00:00 1.545.312 ESP32_GENERIC-OTA-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.545.312 ESP32_GENERIC-OTA-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.545.120 ESP32_GENERIC-OTA-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.545.312 ESP32_GENERIC-OTA-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.545.312 ESP32_GENERIC-OTA-v1.23.0-preview.62.bin\n", "19-10-2023 14:45 1.601.072 ESP32_GENERIC-SPIRAM-v1.21.0.bin\n", "19-10-2023 14:45 1.601.200 ESP32_GENERIC-SPIRAM-v1.22.0-preview.27.bin\n", "30-12-2023 00:28 1.614.304 ESP32_GENERIC-SPIRAM-v1.22.0-preview.278.bin\n", @@ -268,7 +375,12 @@ "19-10-2023 14:45 1.601.200 ESP32_GENERIC-SPIRAM-v1.22.0-preview.31.bin\n", "19-10-2023 14:45 1.601.200 ESP32_GENERIC-SPIRAM-v1.22.0-preview.32.bin\n", "30-12-2023 00:28 1.614.576 ESP32_GENERIC-SPIRAM-v1.22.0.bin\n", + "25-01-2024 00:00 1.614.576 ESP32_GENERIC-SPIRAM-v1.22.1.bin\n", + "25-01-2024 00:00 1.614.832 ESP32_GENERIC-SPIRAM-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.614.832 ESP32_GENERIC-SPIRAM-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.614.624 ESP32_GENERIC-SPIRAM-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.614.832 ESP32_GENERIC-SPIRAM-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.614.832 ESP32_GENERIC-SPIRAM-v1.23.0-preview.62.bin\n", "19-10-2023 14:45 1.653.872 ESP32_GENERIC-UNICORE-v1.21.0.bin\n", "19-10-2023 14:45 1.654.032 ESP32_GENERIC-UNICORE-v1.22.0-preview.27.bin\n", "30-12-2023 00:28 1.728.880 ESP32_GENERIC-UNICORE-v1.22.0-preview.278.bin\n", @@ -279,7 +391,12 @@ "19-10-2023 14:45 1.654.032 ESP32_GENERIC-UNICORE-v1.22.0-preview.31.bin\n", "19-10-2023 14:45 1.654.032 ESP32_GENERIC-UNICORE-v1.22.0-preview.32.bin\n", "30-12-2023 00:28 1.729.152 ESP32_GENERIC-UNICORE-v1.22.0.bin\n", + "25-01-2024 00:00 1.729.152 ESP32_GENERIC-UNICORE-v1.22.1.bin\n", + "25-01-2024 00:00 1.729.424 ESP32_GENERIC-UNICORE-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.729.424 ESP32_GENERIC-UNICORE-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.729.232 ESP32_GENERIC-UNICORE-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.729.424 ESP32_GENERIC-UNICORE-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.729.424 ESP32_GENERIC-UNICORE-v1.23.0-preview.62.bin\n", "19-10-2023 14:45 1.661.872 ESP32_GENERIC-v1.21.0.bin\n", "19-10-2023 14:45 1.662.032 ESP32_GENERIC-v1.22.0-preview.27.bin\n", "30-12-2023 00:28 1.737.408 ESP32_GENERIC-v1.22.0-preview.278.bin\n", @@ -290,23 +407,38 @@ "19-10-2023 14:45 1.662.032 ESP32_GENERIC-v1.22.0-preview.31.bin\n", "19-10-2023 14:45 1.662.032 ESP32_GENERIC-v1.22.0-preview.32.bin\n", "30-12-2023 00:28 1.737.664 ESP32_GENERIC-v1.22.0.bin\n", + "25-01-2024 00:00 1.737.664 ESP32_GENERIC-v1.22.1.bin\n", + "25-01-2024 00:00 1.737.904 ESP32_GENERIC-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.737.904 ESP32_GENERIC-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.737.728 ESP32_GENERIC-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.737.904 ESP32_GENERIC-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.737.904 ESP32_GENERIC-v1.23.0-preview.62.bin\n", "03-01-2024 11:55 1.561.184 ESP32_GENERIC_S3-SPIRAM_OCT-v1.21.0.bin\n", "30-12-2023 00:29 1.631.216 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.0-preview.278.bin\n", "30-12-2023 00:29 1.631.536 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.0-preview.281.bin\n", "30-12-2023 00:29 1.631.600 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.0-preview.283.bin\n", "30-12-2023 00:29 1.631.584 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.0-preview.289.bin\n", "30-12-2023 00:29 1.631.504 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.0.bin\n", + "25-01-2024 00:00 1.631.504 ESP32_GENERIC_S3-SPIRAM_OCT-v1.22.1.bin\n", + "25-01-2024 00:00 1.631.728 ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.631.728 ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.631.584 ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.6.bin\n", + "25-01-2024 00:00 1.631.728 ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.631.728 ESP32_GENERIC_S3-SPIRAM_OCT-v1.23.0-preview.62.bin\n", "03-01-2024 11:55 1.559.472 ESP32_GENERIC_S3-v1.21.0.bin\n", "30-12-2023 00:29 1.627.952 ESP32_GENERIC_S3-v1.22.0-preview.278.bin\n", "30-12-2023 00:29 1.628.272 ESP32_GENERIC_S3-v1.22.0-preview.281.bin\n", "30-12-2023 00:29 1.628.320 ESP32_GENERIC_S3-v1.22.0-preview.283.bin\n", "30-12-2023 00:28 1.628.320 ESP32_GENERIC_S3-v1.22.0-preview.289.bin\n", "30-12-2023 00:28 1.628.240 ESP32_GENERIC_S3-v1.22.0.bin\n", + "25-01-2024 00:00 1.628.240 ESP32_GENERIC_S3-v1.22.1.bin\n", + "25-01-2024 00:00 1.628.496 ESP32_GENERIC_S3-v1.23.0-preview.58.bin\n", + "25-01-2024 00:00 1.628.496 ESP32_GENERIC_S3-v1.23.0-preview.59.bin\n", "03-01-2024 11:55 1.628.304 ESP32_GENERIC_S3-v1.23.0-preview.6.bin\n", - " 69 File(s) 111.571.760 bytes\n", - " 2 Dir(s) 348.284.379.136 bytes free\n" + "25-01-2024 00:00 1.628.496 ESP32_GENERIC_S3-v1.23.0-preview.60.bin\n", + "25-01-2024 00:00 1.628.496 ESP32_GENERIC_S3-v1.23.0-preview.62.bin\n", + " 104 File(s) 168.480.160 bytes\n", + " 2 Dir(s) 355.654.905.856 bytes free\n" ] }, { diff --git a/src/stubber/__init__.py b/src/stubber/__init__.py index aed88819..c99e5237 100644 --- a/src/stubber/__init__.py +++ b/src/stubber/__init__.py @@ -1,4 +1,4 @@ """get the version""" -__version__ = "1.16.2" +__version__ = "1.16.3" diff --git a/src/stubber/basicgit.py b/src/stubber/basicgit.py index d9ecf4fd..f132fcd1 100644 --- a/src/stubber/basicgit.py +++ b/src/stubber/basicgit.py @@ -42,7 +42,7 @@ def _run_local_git( return None except subprocess.CalledProcessError as e: # pragma: no cover # add some logging for github actions - log.error(f"{str(e)} : { e.stderr.decode('utf-8')}") + log.error(f"{str(e)} : { e.stderr}") return None if result.stderr and result.stderr != b"": stderr = result.stderr @@ -150,7 +150,7 @@ def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool: """ checkout a specific git tag """ - cmd = ["git", "checkout", "tags/" + tag, "--detach", "--quiet", "--force"] + cmd = ["git", "checkout", tag, "--quiet", "--force"] result = _run_local_git(cmd, repo=repo, expect_stderr=True, capture_output=True) if not result: return False diff --git a/src/stubber/board/createstubs.py b/src/stubber/board/createstubs.py index b9aff753..f8f45beb 100644 --- a/src/stubber/board/createstubs.py +++ b/src/stubber/board/createstubs.py @@ -25,7 +25,7 @@ from ucollections import OrderedDict # type: ignore -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/board/createstubs_db.py b/src/stubber/board/createstubs_db.py index ee508f84..392702f5 100644 --- a/src/stubber/board/createstubs_db.py +++ b/src/stubber/board/createstubs_db.py @@ -18,7 +18,7 @@ - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device -This variant was generated from createstubs.py by micropython-stubber v1.16.2 +This variant was generated from createstubs.py by micropython-stubber v1.16.3 """ # Copyright (c) 2019-2023 Jos Verlinde @@ -59,7 +59,7 @@ def feed(self): wdt.feed() -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/board/createstubs_db_min.py b/src/stubber/board/createstubs_db_min.py index 05817f71..6f1f0973 100644 --- a/src/stubber/board/createstubs_db_min.py +++ b/src/stubber/board/createstubs_db_min.py @@ -18,7 +18,7 @@ - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device -This variant was generated from createstubs.py by micropython-stubber v1.16.2 +This variant was generated from createstubs.py by micropython-stubber v1.16.3 """ # Copyright (c) 2019-2023 Jos Verlinde @@ -59,7 +59,7 @@ def feed(self): wdt.feed() -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/board/createstubs_mem.py b/src/stubber/board/createstubs_mem.py index cbdb970d..04cc0aeb 100644 --- a/src/stubber/board/createstubs_mem.py +++ b/src/stubber/board/createstubs_mem.py @@ -9,7 +9,7 @@ - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device -This variant was generated from createstubs.py by micropython-stubber v1.16.2 +This variant was generated from createstubs.py by micropython-stubber v1.16.3 """ # Copyright (c) 2019-2023 Jos Verlinde @@ -50,7 +50,7 @@ def feed(self): wdt.feed() -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/board/createstubs_mem_min.py b/src/stubber/board/createstubs_mem_min.py index d610d52b..26282023 100644 --- a/src/stubber/board/createstubs_mem_min.py +++ b/src/stubber/board/createstubs_mem_min.py @@ -9,7 +9,7 @@ - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device -This variant was generated from createstubs.py by micropython-stubber v1.16.2 +This variant was generated from createstubs.py by micropython-stubber v1.16.3 """ # Copyright (c) 2019-2023 Jos Verlinde @@ -50,7 +50,7 @@ def feed(self): wdt.feed() -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/board/createstubs_min.py b/src/stubber/board/createstubs_min.py index 7b134cbf..a3c386e9 100644 --- a/src/stubber/board/createstubs_min.py +++ b/src/stubber/board/createstubs_min.py @@ -40,7 +40,7 @@ def feed(self): wdt.feed() -__version__ = "v1.16.2" +__version__ = "v1.16.3" ENOENT = 2 _MAX_CLASS_LEVEL = 2 # Max class nesting LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"] diff --git a/src/stubber/utils/repos.py b/src/stubber/utils/repos.py index 82497d4a..cec44483 100644 --- a/src/stubber/utils/repos.py +++ b/src/stubber/utils/repos.py @@ -88,8 +88,10 @@ def match_lib_with_mpy(version_tag: str, mpy_path: Path, lib_path: Path) -> bool # micropython-lib is now a submodule result = git.checkout_tag(version_tag, lib_path) if not result: - log.error("Could not checkout micropython-lib @master") - return False + log.warning(f"Could not checkout micropython-lib @{version_tag}") + if not git.checkout_tag("master", lib_path): + log.error("Could not checkout micropython-lib @master") + return False return git.sync_submodules(mpy_path) else: log.info(