Skip to content

Commit

Permalink
Rename GHData -> Augur
Browse files Browse the repository at this point in the history
  • Loading branch information
howderek committed Apr 12, 2018
1 parent 12db352 commit cc68d33
Show file tree
Hide file tree
Showing 106 changed files with 719 additions and 928 deletions.
14 changes: 0 additions & 14 deletions .idea/ghdata.iml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

157 changes: 0 additions & 157 deletions .idea/workspace.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .pytest_cache/v/cache/lastfailed

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -4,7 +4,7 @@ We love pull requests from everyone.

Fork, then clone the repo:

git clone git@github.com:your-username/ghdata.git
git clone git@github.com:your-username/augur.git

Make your change and push to your fork. Then, [submit a pull request][pr].

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -7,7 +7,7 @@ ENV STATIC_INDEX 1
COPY ./docker/uwsgi.ini /app/uwsgi.ini
COPY ./frontend/public /app/static

RUN mkdir /ghdata
WORKDIR /ghdata
ADD . /ghdata
RUN mkdir /augur
WORKDIR /augur
ADD . /augur
RUN pip install --upgrade .
20 changes: 10 additions & 10 deletions Makefile
Expand Up @@ -6,20 +6,20 @@ PY3 := $(shell command -v pip3 2> /dev/null)
NODE := $(shell command -v npm 2> /dev/null)
CONDA := $(shell command -v conda 2> /dev/null)

SERVECOMMAND=gunicorn -w`getconf _NPROCESSORS_ONLN` -b0.0.0.0:5000 ghdata.server:app
SERVECOMMAND=gunicorn -w`getconf _NPROCESSORS_ONLN` -b0.0.0.0:5000 augur.server:app

CONDAUPDATE=""
CONDAACTIVATE=""
ifdef CONDA
CONDAUPDATE=if ! source activate ghdata; then conda env create -n=ghdata -f=environment.yml && source activate ghdata; else conda env update -n=ghdata -f=environment.yml && source activate ghdata; fi;
CONDAACTIVATE=source activate ghdata;
CONDAUPDATE=if ! source activate augur; then conda env create -n=augur -f=environment.yml && source activate augur; else conda env update -n=augur -f=environment.yml && source activate augur; fi;
CONDAACTIVATE=source activate augur;
endif

default:
@ echo "Commands:"
@ echo
@ echo " install Installs ghdata using pip"
@ echo " install-dev Installs ghdata's developer dependencies (requires npm and pip)"
@ echo " install Installs augur using pip"
@ echo " install-dev Installs augur's developer dependencies (requires npm and pip)"
@ echo " install-msr Installs MSR14 dataset"
@ echo " upgrade Pulls newest version and installs"
@ echo " test Run pytest unit tests"
Expand Down Expand Up @@ -74,15 +74,15 @@ ugh:
dev-start: dev-stop
ifdef CONDA
@ bash -c '(cd frontend; brunch w -s >../logs/frontend.log 2>&1 & echo $$! > ../logs/frontend.pid);'
@ bash -c '(source activate ghdata; $(SERVECOMMAND) >logs/backend.log 2>&1 & echo $$! > logs/backend.pid);'
@ bash -c '(source activate augur; $(SERVECOMMAND) >logs/backend.log 2>&1 & echo $$! > logs/backend.pid);'
else
@ bash -c '(cd frontend; brunch w -s >../logs/frontend.log 2>&1 & echo $$! > ../logs/frontend.pid);'
@ bash -c '($(SERVECOMMAND) >logs/backend.log 2>&1 & echo $$! > logs/backend.pid);'
endif
@ echo "Server Description Log Monitoring PID "
@ echo "------------------------------------------------------------------------------------------ "
@ echo "Frontend Brunch logs/frontend.log make monitor-backend $$( cat logs/frontend.pid ) "
@ echo "Backend GHData/Gunicorn logs/backend.log make monitor-frontend $$( cat logs/backend.pid ) "
@ echo "Backend Augur/Gunicorn logs/backend.log make monitor-frontend $$( cat logs/backend.pid ) "
@ echo
@ echo "Monitor both: make monitor "
@ echo "Restart and monitor: make dev"
Expand Down Expand Up @@ -113,7 +113,7 @@ serve:
ifdef CONDA
bash -c "$(SERVECOMMAND)"
else
gunicorn -w`getconf _NPROCESSORS_ONLN` -b0.0.0.0:5000 ghdata.server:app
gunicorn -w`getconf _NPROCESSORS_ONLN` -b0.0.0.0:5000 augur.server:app
endif

python-docs:
Expand All @@ -122,12 +122,12 @@ python-docs:
&& make html

api-docs:
apidoc --debug -f "\.py" -i ghdata/ -o docs/api/
apidoc --debug -f "\.py" -i augur/ -o docs/api/

docs: api-docs python-docs

build: docs
cd ghdata/static/ && brunch build --production
cd augur/static/ && brunch build --production

check-test-env:
ifndef DB_TEST_URL
Expand Down

0 comments on commit cc68d33

Please sign in to comment.