diff --git a/.gitignore b/.gitignore index 61e02dae70..38ebd38bef 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,6 @@ build # lock files for examples and components dependencies.lock + +# managed_components for examples +managed_components diff --git a/requirements.txt b/requirements.txt index 120562c49b..23de87ac77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ future>=0.15.2 cryptography>=2.1.4 pyparsing>=2.0.3,<2.4.0 pyelftools>=0.22 +idf-component-manager>=0.2.99-beta gdbgui==0.13.2.0 # 0.13.2.1 supports Python 3.6+ only diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 8eda08f8a7..b864c03c2c 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -717,14 +717,9 @@ endmenu\n" >> ${IDF_PATH}/Kconfig print_status "Compiles with dependencies delivered by component manager" clean_build_dir - # Make sure that component manager is not installed - pip uninstall -y idf_component_manager printf "\n#include \"test_component.h\"\n" >> main/main.c printf "dependencies:\n test_component:\n path: test_component\n git: ${COMPONENT_MANAGER_TEST_REPO}\n" >> main/idf_component.yml - ! idf.py build || failure "Build should fail if dependencies are not installed" - pip install ${COMPONENT_MANAGER_PACKAGE} --upgrade || failure "Failed to install component manager" idf.py reconfigure build || failure "Build didn't succeed with required components installed by package manager" - pip uninstall -y idf_component_manager rm main/idf_component.yml git checkout main/main.c