From 4c605f3c2bf6833085fd352aadde4905d72ae1ae Mon Sep 17 00:00:00 2001 From: ivan-aksamentov Date: Mon, 25 Oct 2021 11:09:41 +0200 Subject: [PATCH] fix: install the latest conan through pip on macos https://github.com/conan-io/conan-center-index/issues/5197 --- .circleci/config.yml | 1 + .gitignore | 1 + Brewfile | 1 - docs/dev/developers-guide-cli.md | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8834341f39..0289ae8d8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -250,6 +250,7 @@ jobs: set -x brew bundle conan profile new default --detect + pip3 install --upgrade -r requirements.txt environment: HOMEBREW_NO_AUTO_UPDATE: 1 CONAN_USER_HOME: '/Users/distiller/project/.cache' diff --git a/.gitignore b/.gitignore index f9266544f2..443d978ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ paper/paper.pdf tmp build/ *.bak +Brewfile.lock.json diff --git a/Brewfile b/Brewfile index 5dd8544f30..dcba46c39c 100644 --- a/Brewfile +++ b/Brewfile @@ -2,7 +2,6 @@ brew "autoconf" brew "automake" brew "ccache" brew "cmake" -brew "conan" brew "coreutils" brew "cppcheck" brew "ghr" diff --git a/docs/dev/developers-guide-cli.md b/docs/dev/developers-guide-cli.md index f2274766ae..555a556aaa 100644 --- a/docs/dev/developers-guide-cli.md +++ b/docs/dev/developers-guide-cli.md @@ -62,6 +62,7 @@ The easiest way to start the development is to use the included docker container cd nextclade brew bundle --file=Brewfile + pip3 install --upgrade -r requirements.txt ```