Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updating m1 make and doc #1114

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

updating m1 make and doc #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ make install
make install-m1

Then activate the virtual environment with:
conda activate beagle
source conda/bin/activate beagle

2a. initialize the database with:
make db-init
Expand Down Expand Up @@ -95,7 +95,7 @@ unexport PYTHONHOME

ifeq ($(UNAME), Darwin)
ifeq ($(UNAME_P), Darwin_arm)
CONDASH:=Miniconda3-latest-MacOSX-arm64.sh
CONDASH:=Miniconda3-py38_4.12.0-MacOSX-arm64.sh
endif
endif

Expand Down Expand Up @@ -137,7 +137,7 @@ install: conda
# install the Beagle requirements, m1 friendly
install-m1: conda
CONDA_SUBDIR=osx-64 conda create -y -n beagle python=3.8
$(shell conda/bin/activate beagle && \
source conda/bin/activate beagle && \
conda config --system --set subdir osx-64 && \
conda install -y \
conda-forge::ncurses=6.1 \
Expand All @@ -147,7 +147,7 @@ install-m1: conda
bioconda::rabix-bunny=1.0.4 \
conda-forge::jq && \
pip install -r requirements.txt && \
pip install -r requirements-dev.txt)
pip install -r requirements-dev.txt

export ENVIRONMENT=dev
# ~~~~~ Set Up Demo Postgres Database for Dev ~~~~~ #
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ make install-m1
and activate the conda environment:

```
conda activate beagle
source conda/bin/activate beagle
```

- Initialize the PostgreSQL database:
Expand Down