Skip to content

Commit

Permalink
fix: install the latest conan through pip on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-aksamentov committed Oct 25, 2021
1 parent f91247b commit 8586bed
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
10 changes: 9 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,14 @@ jobs:
command: |
set -x
brew bundle
mkdir -p .cache
python3 -m venv .cache/venv
source .cache/venv/bin/activate
pip3 install --upgrade -r requirements.txt
conan profile new default --detect
environment:
HOMEBREW_NO_AUTO_UPDATE: 1
CONAN_USER_HOME: '/Users/distiller/project/.cache'
Expand All @@ -269,7 +276,8 @@ jobs:
- run:
name: Run macOS << parameters.macos_arch >> build
command: |
echo "DATA_FULL_DOMAIN=${DATA_FULL_DOMAIN}" >> .env
source .cache/venv/bin/activate
echo "DATA_FULL_DOMAIN=https://data.master.clades.nextstrain.org" >> .env
make prod
environment:
CONAN_USER_HOME: '/Users/distiller/project/.cache'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ paper/paper.pdf
tmp
build/
*.bak
Brewfile.lock.json
1 change: 0 additions & 1 deletion Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ brew "autoconf"
brew "automake"
brew "ccache"
brew "cmake"
brew "conan"
brew "coreutils"
brew "cppcheck"
brew "ghr"
Expand Down
7 changes: 6 additions & 1 deletion docs/dev/developers-guide-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,19 @@ The easiest way to start the development is to use the included docker container
💡 Quick install for macOS (click to expand)
</summary>
You need to install XCode command line tools. After that you can install remaining required dependencies using [Homebrew](https://brew.sh/) and pip
You need to install XCode command line tools. After that you can install remaining required dependencies using [Homebrew](https://brew.sh/) and pip (into a Python virtual environment)
```
xcode-select --install
cd nextclade
brew bundle --file=Brewfile
mkdir -p .cache
python3 -m venv .cache/venv
source .cache/venv/bin/activate
pip3 install --upgrade -r requirements.txt
```
</details>
</p>
Expand Down

0 comments on commit 8586bed

Please sign in to comment.