From 31d8558d8cdabc77d7e17b19af7c8eb0b1305c3d Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Sun, 8 May 2022 10:53:00 -0700 Subject: [PATCH] Move CI build requirements to their own file so CMake doesn't get confused about them. They weren't really needed anyway for the CMake build. --- docker_images/mbed-os-env/Dockerfile | 2 +- tools/requirements-ci-build.txt | 7 +++++++ tools/requirements.txt | 7 +------ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tools/requirements-ci-build.txt diff --git a/docker_images/mbed-os-env/Dockerfile b/docker_images/mbed-os-env/Dockerfile index 35d80b05a9..4f391ea953 100644 --- a/docker_images/mbed-os-env/Dockerfile +++ b/docker_images/mbed-os-env/Dockerfile @@ -49,7 +49,7 @@ RUN set -x \ && pip3 install -r requirements.txt \ && : # last line -COPY tools/test/requirements.txt . +COPY tools/requirements-ci-build.txt . RUN set -x \ && pip3 install -r requirements.txt \ && : # last line diff --git a/tools/requirements-ci-build.txt b/tools/requirements-ci-build.txt new file mode 100644 index 0000000000..f6fe956a5d --- /dev/null +++ b/tools/requirements-ci-build.txt @@ -0,0 +1,7 @@ +# This file contains the requirements needed to run CI builds for Mbed OS. +# It installs flashing support through the mbed tools packages and also the mbedhtrun test runner. +mbed-tools +mbed-host-tests +mbed-greentea +mbed-ls +mbed-os-tools \ No newline at end of file diff --git a/tools/requirements.txt b/tools/requirements.txt index 29467b293d..e93be8f384 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -2,9 +2,4 @@ PrettyTable<=1.0.1; python_version < '3.6' prettytable>=2.0,<3.0; python_version >= '3.6' future>=0.18.0,<1.0 jinja2>=2.11.3 -intelhex>=2.3.0,<3.0.0 -mbed-tools -mbed-host-tests -mbed-greentea -mbed-ls -mbed-os-tools \ No newline at end of file +intelhex>=2.3.0,<3.0.0 \ No newline at end of file