Skip to content

Commit

Permalink
🔀️ Merge branch 'ladislas/feature/upgrade-python' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed May 10, 2024
2 parents 9da3fb3 + 0fb8875 commit 030653c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ runs:
- name: Install pip packages
shell: bash
run: |
pip install --upgrade --upgrade-strategy eager mbed-cli mbed-tools imgtool
pip install --upgrade --upgrade-strategy eager -r ./requirements.txt
pip install --upgrade --upgrade-strategy eager -r ./tools/config/mbed_requirements.txt
pip install --upgrade --upgrade-strategy eager -r ./extern/mcuboot/scripts/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion cmake/mbed-cmake.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ endforeach()

# find python (used for memap and several upload methods)
# -------------------------------------------------------------
find_package(Python3 3.10 EXACT COMPONENTS Interpreter)
find_package(Python3 3.10 COMPONENTS Interpreter)

# load the Mbed CMake functions
# -------------------------------------------------------------
Expand Down
16 changes: 5 additions & 11 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ brew install coreutils
# 💡 don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to your `$PATH`

# then the prerequisites
brew install git curl python
brew install git curl python3

# and finally the needed tools
brew install make cmake ninja lcov gcovr stlink ccache open-ocd clang-format
Expand All @@ -64,23 +64,17 @@ I recommend the manual install. Make sure to follow the instructions from mbed:
> <https://os.mbed.com/docs/mbed-os/v6.15/build-tools/install-and-set-up.html>
```bash
# install mbed-cli and mbed-tools (mbed-cli2)
python3 -m pip install -U --user mbed-cli mbed-tools

# then install the important packages
python3 -m pip install -U --user pyserial intelhex prettytable

# and finally mbed-cli requirements
python3 -m pip install -U --user -r ./tools/config/mbed_requirements.txt
python3 -m pip install -U --user -r --break-system-packages ./requirements.txt
python3 -m pip install -U --user -r --break-system-packages ./tools/config/mbed_requirements.txt
```

### 3. Install arm-none-eabi-gcc

#### macOS

```bash
brew tap ArmMbed/homebrew-formulae
brew install arm-none-eabi-gcc
brew tap brew tap osx-cross/arm
brew install arm-gcc-bin
```

## How to use
Expand Down
5 changes: 5 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mbed-cli>=1.10.0,<2.0
pyserial>=3,<=3.4
intelhex>=2.3.0,<3.0.0
prettytable>=2.0,<3.0
imgtool>=2.0.0,<3.0.0

0 comments on commit 030653c

Please sign in to comment.