Merge branch 'dev' of https://github.com/phac-nml/galaxy into configu…

…rable_priorities__default_priorities
galaxyproject · Feb 13, 2018 · 6943470 · 6943470
2 parents 3d1cd3d + af3a69b
commit 6943470
Show file tree

Hide file tree

Showing 1,985 changed files with 89,916 additions and 131,572 deletions.
diff --git a/.ci/check_py3_compatibility.sh b/.ci/check_py3_compatibility.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+if command -v ack-grep >/dev/null; then
+    ACK=ack-grep
+else
+    ACK=ack
+fi
+
+export ACK_OPTIONS=" --type python \
+--ignore-dir=.git/ \
+--ignore-dir=.tox/ \
+--ignore-dir=.venv/ \
+--ignore-dir=client/node_modules/ \
+--ignore-dir=database/ \
+--ignore-dir=doc/build/ \
+--ignore-dir=eggs/ \
+--ignore-dir=static/maps/ \
+--ignore-dir=static/scripts/"
+
+PYTHON2_ONLY_MODULES="__builtin__ _winreg BaseHTTPServer CGIHTTPServer \
+ConfigParser Cookie cookielib copy_reg cPickle cStringIO Dialog dummy_thread \
+FileDialog gdbm htmlentitydefs HTMLParser httplib Queue robotparser \
+ScrolledText SimpleDialog SimpleHTTPServer SimpleXMLRPCServer SocketServer \
+StringIO thread Tix tkColorChooser tkCommonDialog Tkconstants Tkdnd tkFont \
+Tkinter tkFileDialog tkMessageBox tkSimpleDialog ttk urllib urllib2 urlparse \
+xmlrpclib"
+
+ret=0
+for mod in $PYTHON2_ONLY_MODULES; do
+    $ACK "^import $mod(\n|\.)|^from $mod import "
+    if [ $? -eq 0 ]; then ret=1; fi
+done
+
+exit $ret
diff --git a/.ci/first_startup.sh b/.ci/first_startup.sh
@@ -10,7 +10,7 @@ bash run.sh --daemon && \
         sleep 1
         i=$((i + 1))
     done
-kill -9 "$(cat paster.pid)"
+kill -9 "$(cat galaxy.pid)"
 echo "exit code:$EXIT_CODE, showing startup log:"
-cat paster.log
+cat galaxy.log
 exit $EXIT_CODE
diff --git a/.ci/flake8_lint_include_list.txt b/.ci/flake8_lint_include_list.txt
diff --git a/.ci/flake8_py3_wrapper.sh b/.ci/flake8_py3_wrapper.sh
diff --git a/.ci/flake8_wrapper_imports.sh b/.ci/flake8_wrapper_imports.sh