Commit Graph
44 Commits
Author SHA1 Message Date
John Chilton 1a463f1688 Pull build_sites out of datatypes conf.
So deployers may modify these paths and stil use the default datatypes config.

This should speed up set_metadata also since each of these config files won't be loaded as part of that.
2017-01-30 20:43:29 -05:00
Dannon Baker 0b395a7fb3 Slight clarification of run.sh messaging when using conda. 2016-11-16 16:16:33 -05:00
Dannon Baker 7f5d9d2fbd More startup logic tweaks, .venv > conda > new_venv 2016-11-16 11:04:42 -05:00
Dannon Baker 72d360e942 Change startup logic for .venv sourcing. If a .venv exists, use it. If not, if conda is there, use it. If no conda, create a .venv. 2016-11-16 10:44:48 -05:00
Nicola Soranzo 87d6239c36 Improve startup scripts
Fix errors reported by shellcheck
2016-08-11 15:28:28 +01:00
Ben 6516f20602 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"
2016-08-08 22:40:06 -04:00
Dannon Baker 61a11341f9 When CONDA_ALREADY_INSTALLED is undefined there's an error due to the number of arguments in the boolean expression (we actually *do* always want a 1 or 0 there, never empty) 2016-07-08 10:52:08 -04:00
Remi Marenco de702db55d s/creation/activation. Thx @nsoranzo 2016-07-07 15:45:40 -04:00
remimarenco b53a9275d5 Add Warning when Conda is installed because we skip the virtualenv creation
Fix the case where we could have conda not installed but not setting VirtualEnv still (and have this non relevant warning
2016-07-07 14:34:40 -04:00
Nate Coraor 1be90e49b1 Remove unused $GXPIP_VERSION 2016-05-20 09:44:55 -04:00
Nate Coraor 39d78c7226 Drop "Galaxy pip" in favor of manylinux1 wheels (which are supported in
pip >= 8.1).
2016-05-19 14:42:52 -04:00
matthdsm ea2e9163d6 changed grep statement to match 2 patterns
Now matches both "anaconda" and "continuum analytics"
2016-05-17 08:06:21 +02:00
matthdsm 90c48ff6e3 update check for Conda env. 2016-05-03 15:30:51 +02:00
John Chilton b3881f86c1 For non-shed tool data - read loc from sample if available. 2016-04-01 17:25:47 -04:00
Nate Coraor 04af1ae1c6 Always use the python hashlib for verifying the virtualenv download in
common_startup.sh rather than attempting to use sha256sum. Older
versions of coreutils (such as in RHEL 6) did not include the --strict
argument to sha256sum.
2016-02-03 13:16:27 -05:00
Dannon Baker 6635e91170 Bump gx pip version to fix OSX platform issues. 2016-02-02 10:45:14 -05:00
Nate Coraor 60062b020d pip 1.6 -> 6.0, thanks @nsoranzo 2016-01-28 12:46:14 -05:00
Nate Coraor 46471d61e4 pip < 1.6 cannot parse requirement specifiers to the install command
that contain a `+` in the version. For these older versions, directly
install the wheel or install from the sdist. Technically 1.4 and later
can install wheels, but in testing, only 1.5+ was able to install them
properly with their scripts.

The new heredoc execute and redirect syntax is Bourne-compatible.

pip --pre is no longer necessary since the Galaxy pip version is no
longer a development version of pip.
2016-01-28 10:45:54 -05:00
Nate Coraor 390c1fc275 Always install a specific version of Galaxy pip in common_startup.sh. 2016-01-27 09:57:41 -05:00
Nate Coraor 8ceb4d8ee4 Force --skip-venv if we can detect that Python is Conda Python. 2016-01-21 11:49:51 -05:00
John Chilton 8fd83df665 Allow override of location of virtual env Galaxy manages. 2016-01-13 13:55:36 +00:00
John Chilton 9dc9ddf8cd Add --replace-pip option to common_startup.sh.
Needed to restore correct functionality to planemo.
2016-01-13 13:55:35 +00:00
Nate Coraor 4eefd885ec Improve startup options related to wheel/dependency/virtualenv
management. Drop hard requirement on lzo (doubt anyone other than
usegalaxy.org is using it, but it will be added as a extras option for
bxlab/bx-python for anyone who is).

Fixes #1150
2015-12-22 14:03:50 -05:00
Nate Coraor 43e38414e6 --pre does not exist on pip < 1.4, but on pip < 1.4, the default
behavior was the same as using --pre on pip >= 1.4. Therefore, detect
the version of pip and add --pre if necessary.

Fixes #1134
2015-12-18 12:27:12 -05:00
Nate Coraor 1a3a594d4e Allow CentOS to install RHEL wheels. 2015-10-26 15:47:51 -04:00
Nate Coraor d90ba82e92 Add a --dev-wheels arg to common_startup.sh (called by run_tests.sh by
default) that will install things in dev-requirements.txt.
2015-10-26 14:07:00 -04:00
Nate Coraor 88683c3c40 Unset $PYTHONPATH in run.sh and common_startup.sh unless --skip-env is
provided.
2015-10-22 18:42:06 -04:00
Nate Coraor 4a5f5f44dc Install our modified pip as a wheel from wheels.galaxyproject.org rather
than an editable directly from github.

Also, use `set -e` in scripts/common_startup.sh to fail if anything
fails, rather than chaining a bunch of things with `&&` but not properly
handling failure cases.
2015-10-22 15:02:14 -04:00
Nate Coraor d92787557a Move vvers and vurl vars to a more relevant scope. 2015-10-15 11:00:50 -04:00
Nate Coraor 433b79de2b Merge branch 'dev' of https://github.com/galaxyproject/galaxy into smash_eggs 2015-10-13 16:54:18 -04:00
Nate Coraor 744835bbfe Allow the use of common_startup.sh's --skip-eggs from run_tests.sh, and
have tox pass this flag (so that dependencies are installed in the tox
envs)
2015-10-13 12:47:01 -04:00
Nate Coraor 665c4c299d Handle the case where there are no conditional (heh) requirements 2015-10-01 15:38:58 -04:00
Nate Coraor a44b2c2170 Rename galaxy.wheels to the more generalized galaxy.dependencies (since
technically we don't care whether they are wheels), handle optional deps
more correctly. Add error handling to common_startup.sh.
2015-09-22 12:54:03 -04:00
Nate Coraor 40bde6e102 Install required dependencies from requirements.txt rather than
convoluted galaxy.wheels method. Not sure why I was doing that.
Hackathons are dangerous places.
2015-09-21 13:21:13 -04:00
Lance Parsons 5810a853b0 Move manual_builds.txt to manual_builds.txt.sample to allow for customization 2015-08-18 14:00:30 -04:00
Nate Coraor 5501917346 Install modified pip in develop/edit mode so it won't be reinstalled
every time (courtesy @jxtx).
2015-07-05 10:50:54 -04:00
Nate Coraor a24134c447 Install modified pip for fetching Linux wheels, fetch wheels from
wheels.galaxyproject.org
2015-07-05 05:24:15 -04:00
Nate Coraor 633061f3e0 WIP: Stop using eggs, start using prebuilt wheels. 2015-07-04 15:18:50 -04:00
Nate Coraor 92f6ace47f Ensure the correct default Galaxy config file is found in common_startup.sh, it
makes a difference for egg fetching since some eggs are conditional based on
config.
2015-02-12 11:47:58 -05:00
Nate Coraor 267e4d9b88 Don't create galaxy.ini, just use the sample if galaxy.ini does not exist. Also fix startup when galaxy.ini.sample. Fixes the universe_wsgi.ini skipping problem Dannon found. 2014-09-15 22:12:18 -04:00
Nate Coraor 8fadc6392b Rename universe_wsgi.ini -> galaxy.ini everywhere. 2014-09-15 16:43:51 -04:00
Nate Coraor 4227d0eabb Remove additional pieces from old genome index system. 2014-07-27 02:48:40 -04:00
Dave Bouvier 4e63bc8731 Fetch eggs after initializing sample files, per John Chilton's comment. 2014-06-13 17:32:51 -04:00
Dave Bouvier 8b45411adf Abstract common startup tasks into scripts/common_startup.sh, which used to be copy_sample_files.sh. 2014-06-13 16:39:59 -04:00