Commit Graph
1288 Commits
Author SHA1 Message Date
Dannon Baker 085d83d34c Fix template name substitution var 2019-03-19 10:45:20 -04:00
Dannon Baker 5d771424bf Drop debug github object print 2019-03-19 10:24:55 -04:00
Helena Rasche ea0700a032 fix some small bugs 2019-03-14 10:09:36 +01:00
Helena Rasche ec086c1e8b Attempt to automate this? 2019-03-14 10:02:23 +01:00
Dannon Baker 726ad9a0f6 Bump yarn's network timeout from 2 minutes to 5 minutes. 2019-02-21 11:48:11 -05:00
Nicola Soranzo b33b06440f Merge branch 'release_18.09' into release_19.01 2019-02-12 11:51:07 +00:00
Dannon Baker a10d2c51d3 Add/pin configurable node version to 18.09. Backport/tweak of https://github.com/galaxyproject/galaxy/pull/7220) 2019-01-18 11:54:59 -05:00
Nate Coraor 473210714e Add support for dynamic handlers when using DB serialization handler assignment 2018-12-18 13:34:31 -05:00
Nicola Soranzo b22b7e5868 Merge branch 'release_18.09' into dev 2018-12-16 23:02:41 +00:00
Nicola Soranzo 975c8b605f Fix activation of `_galaxy_` conda env
- Use `conda_activate`, which works also under dash
- Run `conda_activate` also when `$GALAXY_CONDA_ENV` already exists
- Run `virtualenv` when the conda env is active but `$GALAXY_VIRTUAL_ENV`
  does not exist
- Update the default for `GALAXY_CONDA_ENV` in
  scripts/common_startup_functions.sh

Follow-up on https://github.com/galaxyproject/galaxy/pull/6975 .
2018-12-14 00:22:12 +00:00
Björn Grüning 6db721915f Merge pull request #7041 from erasche/fix-grt
[18.09] GRT: Rip out all parameters, round file sizes
2018-12-12 19:22:32 +01:00
Nicola Soranzo 16f3be66be Merge branch 'release_18.09' into dev 2018-12-06 14:27:16 +00:00
Dannon Baker 66fae561b2 Don't use pushd/popd 2018-12-02 22:04:45 -05:00
Dannon Baker fa408f4850 exit with error code (and appropriate message) on either build failure 2018-11-29 11:19:49 -05:00
Dannon Baker 77aec5a79d Standardize on spaces in common_startup.sh (tabs were mixed in here) 2018-11-29 11:11:37 -05:00
Dannon Baker be43693ef0 Avoid using make for autobuild; reducing necessary dependencies out of the box. 2018-11-29 11:11:11 -05:00
Nicola Soranzo 9007661765 Merge branch 'release_18.09' into dev 2018-11-23 17:10:04 +00:00
Nicola Soranzo 992ea5e4b9 Pass through `--daemon` option to gunicorn
Documented at
http://docs.gunicorn.org/en/stable/settings.html#daemon
2018-11-23 14:56:15 +00:00
Helena Rasche 855ccb1279 GRT: Rip out all parameters, round file sizes 2018-11-23 12:10:14 +01:00
Nicola Soranzo eaacc5bc9f Merge branch 'release_18.09' into dev 2018-11-15 14:06:09 +01:00
Nicola Soranzo fbd2284e5d Fix PID file handling for gunicorn
gunicorn uses `--pid`, not `--pid-file`.
2018-11-15 11:27:14 +01:00
Nicola Soranzo a53629ebae Update virtualenv installation to v16.1.0
which bundles `wheel` 0.32.2.

The old virtualenv 13.1.2 included wheel 0.24.0, where tagging is broken
for Python >=3.5, producing tracebacks like:

```
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/tmp/pip-install-c53eutpg/uwsgi/setup.py", line 138, in <module>
    'Programming Language :: Python :: 3.6',
  File "/tmp/wheel_venv/lib/python3.7/site-packages/setuptools/__init__.py", line 143, in setup
    return distutils.core.setup(**attrs)
  File "/usr/lib/python3.7/distutils/core.py", line 148, in setup
    dist.run_commands()
  File "/usr/lib/python3.7/distutils/dist.py", line 966, in run_commands
    self.run_command(cmd)
  File "/usr/lib/python3.7/distutils/dist.py", line 985, in run_command
    cmd_obj.run()
  File "/tmp/wheel_venv/lib/python3.7/site-packages/wheel/bdist_wheel.py", line 213, in run
    archive_basename = self.get_archive_basename()
  File "/tmp/wheel_venv/lib/python3.7/site-packages/wheel/bdist_wheel.py", line 161, in get_archive_basename
    impl_tag, abi_tag, plat_tag = self.get_tag()
  File "/tmp/wheel_venv/lib/python3.7/site-packages/wheel/bdist_wheel.py", line 155, in get_tag
    assert tag == supported_tags[0]
AssertionError
```

This was fixed in wheel 0.25.0. Reported by @wm75.

Also update `urlretrieve` import for Python 3.
2018-11-13 17:15:54 +01:00
Marius van den Beek be76d9f801 Merge pull request #6995 from bernt-matthias/topic/external-runner-json-load-order
external_runner: load json template first
2018-11-11 11:51:07 +01:00
Dannon 3ed0ce862b Merge pull request #6975 from mvdbeek/conda_run_sh
Use virtualenv when conda is on PATH
2018-11-09 15:45:54 -05:00
M Bernt 97ba92f3cf external_runner: load json template first
if the JSON is loaded first the cluster_files_directory
does not need to be accessible by the real user (ie all users)
2018-11-09 17:48:36 +01:00
Dannon Baker e8dbb8c58a Upgrade nodeenv's nodejs to 10.13.0 LTS, now that the client build works fine with v10 2018-11-08 10:02:16 -05:00
mvdbeek 9f8c29520d Use virtualenv when conda is on PATH
This uses our proper pinned requirements and is sginificantly easier
to set up and maintain.
2018-11-07 14:20:05 +01:00
Dannon Baker 7dbc81ca82 Add images to default static-safe location 2018-10-30 17:41:14 -04:00
Nicola Soranzo c591691209 Fix typos in `scripts/bootstrap_history.py` 2018-10-29 21:08:41 +00:00
Dannon Baker 5d51492a53 Getgalaxy links 2018-10-29 11:54:05 -04:00
Dannon Baker 66b05cbfc5 Minor clarification 2018-10-29 11:23:16 -04:00
Dannon Baker 30ac5d90d9 Release scaffold tweaks. 2018-10-29 11:20:53 -04:00
Marius van den Beek 2be4f3b2a1 Merge pull request #6921 from nsoranzo/dependencies_update
Update all dependencies
2018-10-26 13:14:42 +02:00
Marius van den Beek 79da3e554c Merge pull request #6913 from nsoranzo/bootstrap_fixes
Fix ``expr: non-integer argument`` error when running ``make``
2018-10-26 11:51:22 +02:00
Nicola Soranzo f4203ca051 Fix errors reported by flake8 3.6.0
Ignore W504.
2018-10-24 23:22:19 +01:00
Nicola Soranzo 949dcfdbc3 Do not log exceptions twice
`logging.exception()` already adds the the exception information after
the supplied message.

Also: the `message` attribute of `Exception` class has been dropped in
Python 3, always use `str(e)`.

xref. https://github.com/galaxyproject/galaxy/issues/1715
2018-10-24 12:57:05 +01:00
Nicola Soranzo 00632a5295 Fix `expr: non-integer argument error when running make`
when `VERSION_MINOR` in `lib/galaxy/version.py` is e.g. `rc1`.

Also:
- Do not require awk
- Remove unused functions
- Do not require the presence of `~/.github.json` file
2018-10-24 01:03:57 +01:00
Nate Coraor e72d52c6df Lint 2018-10-15 16:07:14 -04:00
Nate Coraor e1a197676e Refactor repetitive HDA purging stuff and add a function to purge HDAs
with null history_ids
2018-10-15 14:59:15 -04:00
Nate Coraor ba83310d53 Mostly refactored pgcleanup.py 2018-10-15 14:59:15 -04:00
Nate Coraor 941d68ad35 WIP pgcleanup improvements 2018-10-15 14:59:15 -04:00
Nate Coraor 429ef96a10 WIP pgcleanup improvements 2018-10-15 14:59:15 -04:00
Nicola Soranzo 5e71401a7e Merge branch 'release_18.09' into dev 2018-10-12 09:47:34 +01:00
Nicola Soranzo 9251484e72 Merge pull request #6731 from galaxyproject/18.09_release_notes
[18.09] 18.09 release notes
2018-10-11 17:56:33 +01:00
Nicola Soranzo d42b899b78 Embellish 18.09 release notes 2018-10-11 17:51:07 +01:00
Dannon Baker c6193ca440 Update DEVTEAM, rebuild, include a few new PRs. 2018-10-11 10:37:54 -04:00
Nicola Soranzo 260e37f2bc Merge branch 'release_18.09' into dev 2018-10-01 17:27:30 +01:00
mvdbeek b64c82921e Need quotes around export? 2018-10-01 14:06:12 +02:00
mvdbeek 702870c17c Allow starting Galaxy under gunicorn when using galaxy.ini
and starting Galaxy with `APP_WEBSERVER=gunicorn sh run.sh`.
Additional gunicorn cmdline arguments can be passed using
`GUNICORN_CMD_ARGS`. In a first pass this will allow
running planemo {server, test} under python 3, as Paste
has some problems under python 3:

```
galaxy.web.stack INFO 2018-09-29 22:16:00,216 Galaxy server instance 'main' is running
Traceback (most recent call last):
  File "./scripts/paster.py", line 27, in <module>
    serve.run()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 1055, in run
    invoke(command, command_name, options, args[1:])
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 1061, in invoke
    exit_code = runner.run(args)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 226, in run
    result = self.command()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 676, in command
    serve()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 653, in serve
    server(app)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/loadwsgi.py", line 232, in server_wrapper
    **context.local_conf)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/loadwsgi.py", line 90, in fix_call
    val = callable(*args, **kw)
  File "/home/travis/.planemo/gx_venv_3_release_18.09/lib/python3.6/site-packages/paste/httpserver.py", line 1353, in server_runner
    for name, value in kwargs.items():
RuntimeError: dictionary changed size during iteration
```

That said gunicorn is a nice pure-python alternative to paste going
forward.
2018-09-30 13:18:21 +02:00
Nate Coraor 8dbf140cce Add a pgcleanup action to purge HDAs of purged histories 2018-09-28 16:39:30 -04:00