Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6516f20602259a7b55da57ed6c668b2590a7645c https://github.com/galaxyproject/galaxy/commit/6516f20602259a7b55da57ed6c668... Author: Ben <BenjaminHCCarr@users.noreply.github.com> Date: 2016-08-08 (Mon, 08 Aug 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Update common_startup.sh to require python2.7 in .venv by changing the .venv creation to 'virtualenv -p python2.7' we force the python version we need. The current suggestion on getgalaxy is: https://wiki.galaxyproject.org/Admin/Python % mkdir ~/galaxy-python % ln -s /path/to/python2.7 ~/galaxy-python/python % export PATH=~/galaxy-python:$PATH Which break lots of things, since we are working in a virtual environment anyway we can build it from the start with the version we want. This will require that python 2.7 used in the virtual environment, and prevent breakage from multi-python deployed hosts. This simple change makes the software more accessible. This edit built fine on OS X 10.10.5 python installed: 2.6, 2.7, 3.2, 3.5 galaxy.queue_worker INFO 2016-08-08 22:14:15,624 Binding and starting galaxy control worker for main Starting server in PID 69210. serving on http://127.0.0.1:8080 /Users/benc/Code/github/galaxy/.venv/lib/python2.7/site-packages/sqlalchemy/sql/sqltypes.py:565: SAWarning: Dialect sqlite+pysqlite does *not* support Decimal objects natively, and SQLAlchemy must convert from floating point - rounding errors and other issues may occur. Please consider storing Decimal numbers as strings or integers on this platform for lossless storage. 'storage.' % (dialect.name, dialect.driver)) 127.0.0.1 - - [08/Aug/2016:22:39:18 -0400] "GET / HTTP/1.1" 200 - "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36" Commit: 77b7e65d2b12b3e8de73056fa08d10f874330ae6 https://github.com/galaxyproject/galaxy/commit/77b7e65d2b12b3e8de73056fa08d1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-09 (Tue, 09 Aug 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #2756 from BenjaminHCCarr/patch-2 Update common_startup.sh to require python2.7 in .venv Commit: 8c1be9123151db83f74096ac2ce56681df82f36c https://github.com/galaxyproject/galaxy/commit/8c1be9123151db83f74096ac2ce56... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-09 (Tue, 09 Aug 2016) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge branch 'release_16.07' into dev Compare: https://github.com/galaxyproject/galaxy/compare/580ace125aab...8c1be9123151