diff options
| author | zsloan | 2018-04-16 22:23:19 +0000 |
|---|---|---|
| committer | zsloan | 2018-04-16 22:23:19 +0000 |
| commit | 35913e15bb6ac93c429e9465ebc36215cc6350ea (patch) | |
| tree | d0eaff3a15bb167d995f1459ee7e744697f137b3 /bin | |
| parent | 273b79a0c2096a2eae5ce9aa2800917437459f68 (diff) | |
| parent | f511e38a9b440d08313471cdcc7bfd99add98f70 (diff) | |
| download | genenetwork2-35913e15bb6ac93c429e9465ebc36215cc6350ea.tar.gz | |
Resolved conflicts after pulling changes
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/genenetwork2 | 15 | ||||
| -rwxr-xr-x | bin/test-website | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/bin/genenetwork2 b/bin/genenetwork2 index 18e02388..b3a8d8c2 100755 --- a/bin/genenetwork2 +++ b/bin/genenetwork2 @@ -15,28 +15,29 @@ # installation path of genenetwork). Say your profile is in # ~/opt/gn-latest-guix # -# env GN2_PROFILE=~/opt/gn-latest-guix ./bin/genenetwork2 +# env GN2_PROFILE=~/opt/gn-latest ./bin/genenetwork2 # # You can pass in your own settings file, e.g. # -# env GN2_PROFILE=~/opt/gn-latest-guix ./bin/genenetwork2 ~/my_settings.py +# env GN2_PROFILE=~/opt/gn-latest ./bin/genenetwork2 ~/my_settings.py # # To run a maintenance python script with settings (instead of the -# webserver) add that with a -c switch, e.g. +# webserver) run from the base-dir with settings file and add that +# script with a -c switch, e.g. # -# env GN2_PROFILE=~/opt/gn-latest-guix ./bin/genenetwork2 -c ./wqflask/maintenance/gen_select_dataset.py +# env GN2_PROFILE=~/opt/gn-latest ./bin/genenetwork2 ./etc/default_settings.py -c ./maintenance/gen_select_dataset.py # # To run any script in the environment # -# env GN2_PROFILE=~/opt/gn-latest-guix ./bin/genenetwork2 ./etc/default_settings.py -cli echo "HELLO WORLD" +# env GN2_PROFILE=~/opt/gn-latest ./bin/genenetwork2 ./etc/default_settings.py -cli echo "HELLO WORLD" # # To get a python REPL(!) # -# env GN2_PROFILE=~/opt/gn-latest-guix ./bin/genenetwork2 ./etc/default_settings.py -cli python +# env GN2_PROFILE=~/opt/gn-latest ./bin/genenetwork2 ./etc/default_settings.py -cli python # # For development you may want to run # -# env GN2_PROFILE=~/opt/gn-latest-guix WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG ./bin/genenetwork2 +# env GN2_PROFILE=~/opt/gn-latest WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG ./bin/genenetwork2 # # For staging and production we use gunicorn. Run with something like # (note you have to provide the server port). Provide a settings file! diff --git a/bin/test-website b/bin/test-website index 5935f016..7fbcfd2f 100755 --- a/bin/test-website +++ b/bin/test-website @@ -2,6 +2,6 @@ if [ -z $GN2_PROFILE ]; then echo "Run request tests with something like" - echo env GN2_PROFILE=/home/wrk/opt/gn-latest ./bin/genenetwork2 ./etc/default_settings.py -c ../test/requests/test-website.py http://localhost:5003 + echo env GN2_PROFILE=/home/wrk/opt/gn-latest ./bin/genenetwork2 ./etc/default_settings.py -c ../test/requests/test-website.py -a http://localhost:5003 exit 1 fi |