86 Commits
Author SHA1 Message Date
Dannon Baker 3f8c2beff2 Swap to a production w/ sourcemaps build by default for autobuilder (though, of course, folks can manually do whatever -- seems like the most sensible default though) 2018-09-21 12:24:15 -04:00
Dannon Baker f3298953d4 Don't skip build on release/master moving forward. 2018-09-21 11:42:51 -04:00
Dannon Baker e110489cc5 Call plugin static dir regeneration in the event client isn't being built (which also does this, albeit slightly differently) 2018-06-15 11:46:08 -04:00
Nicola Soranzo 2b8beb69c4 Merge branch 'release_18.01' into release_18.05 2018-06-06 15:58:08 +01:00
Nicola Soranzo c9daa60e91 Look for config file inside galaxy.dependencies.optional()
Also don't fail if no config file is found, just print a message on
stderr.
This allows the removal of the code to set `GALAXY_CONFIG_FILE` from
`scripts/common_startup.sh` .
2018-06-02 03:14:38 +01:00
John Chilton a29770ca55 Pin the version of node we use in CI, etc....
Our dependencies won't resolve under node 10 currently (because of upath at least https://github.com/anodynos/upath/blob/master/package.json#L43 but maybe other packages as well).
2018-04-27 08:09:51 -04:00
John Chilton 3dbcc7c83c Pin the version of node we use in CI, etc....
Our dependencies won't resolve under node 10 currently (because of upath at least https://github.com/anodynos/upath/blob/master/package.json#L43 but maybe other packages as well).
2018-04-24 16:57:43 -04:00
Nate Coraor c5262e8971 Look for both base and root conda envs 2018-04-04 23:18:57 -04:00
Nate Coraor b3eff87a1b Clean up and useability enhancements 2018-04-04 21:03:08 -04:00
Nate Coraor 8261a2398a Make the startup scripts play just as nicely with Conda as they do with
virtualenv.
2018-04-04 16:38:01 -04:00
Dannon Baker e7ecab7734 If psycopg2-binary is installed (as might be if switching between
branches), uninstalling psycopg2 will leave psycopg2-binary installed
but in a broken state.  If we're removing psycopg2, we need to remove
psycopg2-binary at the same time, leaving psycopg2-binary to be
correctly installed afterwards.
2018-04-02 14:14:23 -04:00
Dannon Baker 60ca4d4cc9 Instead of using -q, send to /dev/null, since the early pipe exit blows up pip 2018-03-28 12:42:37 -04:00
Dannon Baker 8742614e52 Quieter grepping. 2018-03-28 12:13:23 -04:00
Dannon Baker d44b47741b Specify format to squelch deprecation warning about columns/legacy 2018-03-23 12:05:29 -04:00
Dannon Baker 30c2ea0c3e Make psycopg2 grep a little more robust 2018-03-23 12:02:41 -04:00
Dannon Baker e84dd5db6b Rudimentary check for old psycopg2==2.4.3, which we clean up before installing psycopg2-binary. 2018-03-23 11:59:56 -04:00
Nicola Soranzo 1dfaa476c0 Rebuild client only if there are changes
in the client/ directory since the last build.
2018-03-13 01:40:06 +00:00
Nicola Soranzo 10ff797ac7 Merge branch 'release_18.01' into dev
Conflicts:
	scripts/common_startup.sh
2018-02-08 13:38:22 -05:00
Nicola Soranzo eba3fb4b35 Fix common_startup.sh for galaxy tarballs
Do not assume git is installed and the `.git` directory is present.

Fix https://github.com/galaxyproject/galaxy/issues/5466
2018-02-08 11:52:24 -05:00
Nate Coraor 977bbf1481 Install node and yarn in common_startup.sh using nodeenv and the venv's
npm.
2018-02-08 11:33:55 -05:00
Martin Cech b4cdce925b Merge branch 'release_18.01' into dev
I removed the conflicted file that was modified
 in dev after removal in 18.01
2018-02-01 15:57:38 -05:00
John Chilton 792a071489 Merge pull request #5359 from mvdbeek/py3_fixes
Various Python3 related fixes
2018-01-26 09:14:59 -05:00
Dannon Baker 2854643057 Merge pull request #5375 from natefoo/nodeenv
Install node and yarn on startup if running a non-release branch
2018-01-25 13:39:00 -05:00
Nate Coraor fd96864bd6 Finish updates to framework dependencies doc 2018-01-25 12:36:11 -05:00
Nicola Soranzo 0ce2d97c4d Create the virtualenv using the python that passed check_python
This will make it easier to support Python3.
2018-01-25 11:52:11 +01:00
Nicola Soranzo e87d1aa79d More Python3 print function fixes 2018-01-25 11:52:11 +01:00
Nate Coraor 8e4eab6e6c Install node and yarn in common_startup.sh using nodeenv and the venv's
npm.
2018-01-24 12:12:56 -05:00
Dannon Baker dd88194e8f Merge pull request #5371 from jmchilton/environment_client_skip
Environment variable to skip client build.
2018-01-24 11:16:50 -05:00
John Chilton 6e865a3363 Environment variable to skip client build.
Need to fix https://github.com/galaxyproject/planemo/issues/750 but I don't want to send along command-line arguments that will break older Galaxies, better just to set an environment variable that will be ignored for older Galaxies I think.
2018-01-24 08:59:59 -05:00
mvdbeek 991f79e630 Use print() function in common_startup.sh 2018-01-21 13:24:07 +01:00
Nate Coraor 44c291bc66 Merge remote-tracking branch 'origin/dev' into ini_to_yaml_config 2018-01-18 12:30:05 -05:00
Martin Cech 542a489079 Merge pull request #5294 from dannon/fix_skip_client_build
Fixes the --no-client-build startup option
2018-01-17 10:16:21 -05:00
anup kumar 6cb9d664de Fix Galaxy instance startup error 2018-01-14 11:42:15 +01:00
Nicola Soranzo a70ecd0147 Fix common_startup.sh bashisms
Introduced in commit 45a25a1b8b .

This was causing this error on the `dev` branch on Ubuntu (which uses
`dash`):

```
$ ./run.sh
./scripts/common_startup.sh: 69: [: dev: unexpected operator
Activating virtualenv at .venv
...
```

instead of exiting with the "The Galaxy client build is out of date." message.
2018-01-12 13:21:04 +01:00
Dannon Baker a5cef0fe68 Fixes the --no-client-build startup option (and renames it --skip-client-build, too) 2018-01-10 12:04:32 -05:00
Dannon Baker c8b454b532 More descriptive help for the dev client build check. 2017-12-20 10:47:06 -05:00
John Chilton 7bae23e105 yaml_config - update code base for converting galaxy.ini.sample to YAML. 2017-12-06 20:28:20 -05:00
Dannon Baker b57af28c9b Elaborate on comment, todo 2017-12-05 07:04:21 -05:00
Dannon Baker 45a25a1b8b Rudimentary build checking for -dev only. 2017-12-04 18:03:27 -05:00
John Chilton a1e91231aa If installing dev dependencies, do so along side regular dependencies.
Catch conflicts and works faster.
2017-11-02 09:49:08 -04:00
John Chilton 09fdac513d Fix extra index URL call in common startup.
- Use it for dev requirements also.
- Use more correct API target that supports older versions of dependencies on PyPI.

xref https://gist.github.com/jmchilton/ad8f180f5ac1eb5f689f815b04f603fa
2017-10-30 10:49:29 -04:00
Nate Coraor 244fc834cd Explicitly include PyPI as an --extra-index-url to pip so we can install
from PyPI even when a package exists (but the correct version or
architecture does not exist) on wheels.galaxyproject.org. Previously,
PyPI was only checked after wheels.galaxyproject.org because pypiserver
performs an automatic redirect to PyPI for any packages that do not
exist in its index.
2017-09-21 16:33:40 -04:00
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