Merge branch 'release_18.09' into dev

galaxyproject · Oct 1, 2018 · 260e37f · 260e37f
2 parents 55c9096 + 1a3e9ae
commit 260e37f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/client/gulpfile.js b/client/gulpfile.js
@@ -131,4 +131,4 @@ gulp.task("watch-style", function() {
 
 gulp.task("staging", ["stage-libs", "fonts"]);
 
-gulp.task("default", ["scripts", "libs", "plugins"]);
+gulp.task("default", ["scripts", "libs"]);
diff --git a/lib/galaxy/dependencies/pipfiles/default/Pipfile b/lib/galaxy/dependencies/pipfiles/default/Pipfile
@@ -9,6 +9,7 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
+gunicorn = "*"
 lxml = "!=4.2.2"
 mock = "*"
 NoseHTML = "*"

diff --git a/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt b/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt
@@ -10,6 +10,7 @@ chardet==3.0.4
 commonmark==0.5.4
 docutils==0.14
 funcsigs==1.0.2; python_version < '3.3'
+gunicorn==19.9.0
 idna==2.7
 imagesize==1.1.0; python_version != '3.3.*'
 jinja2==2.10

diff --git a/scripts/common_startup_functions.sh b/scripts/common_startup_functions.sh
@@ -157,6 +157,10 @@ find_server() {
         fi
         server_args="$server_args $uwsgi_args"
         pid_log_paster_args=""
+    elif [ "$APP_WEBSERVER" = "gunicorn" ];
+    then
+        export GUNICORN_CMD_ARGS="${GUNICORN_CMD_ARGS:-\"--bind=localhost:8080\"}"
+        server_args="$APP_WEBSERVER --pythonpath lib --paste \"$server_config\""
     else
         run_server="python"
         server_args="./scripts/paster.py serve \"$server_config\" $paster_args"