From fd97de9cee9350219d2f8dff1c53980e5772828a Mon Sep 17 00:00:00 2001 From: maxgerhardt Date: Sun, 3 Mar 2024 18:32:53 +0100 Subject: [PATCH] Try alternate install --- .github/workflows/examples.yml | 6 +++--- builder/main.py | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 1446307..3c4b1b9 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -14,13 +14,13 @@ jobs: - "examples/arduino-multiprocessing-message" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.10" # On Linux, wxPython ("needed" for flash_writer.py) # has a dependency on GTK+. Install it here. # the tool just uses it to show a EULA dialog, diff --git a/builder/main.py b/builder/main.py index c076258..d117c45 100644 --- a/builder/main.py +++ b/builder/main.py @@ -318,6 +318,14 @@ def __configure_upload_port(env): # Install wxPython dependency of tool-spresense # def install_python_deps(): + # check if dependencies are installed by just importing them + try: + import wx + import wx.html + return + except ImportError: + print("Spresense tools's Python dependencies (wxPython) not yet installed.") + pass def _get_installed_pip_packages(): result = {} packages = {} @@ -341,8 +349,7 @@ def _get_installed_pip_packages(): return result deps = { - "attrdict3": "==2.0.2", - "wxPython": "==4.2.0" + "wxPython": "==4.2.1" } installed_packages = _get_installed_pip_packages()