Commit Graph
1134 Commits
Author SHA1 Message Date
Nicola Soranzo c9881fdc5c Merge branch 'release_18.01' into dev 2018-04-03 10:54:48 +01: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
John Chilton 08c2c5b5ac Merge pull request #5698 from dannon/psycopg2_bump
Bump psycopg2 to 2.7.4;
2018-03-29 10:47:22 -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
John Chilton b4a30bcd82 Revise uwsgi defaults and display.
In https://github.com/galaxyproject/galaxy/issues/1530 we realized that buffer-size needs to be increased for Galaxy requests. Also mention thunder-lock since that should frequently be enabled - https://github.com/galaxyproject/ansible-galaxy-extras/pull/195.
2018-03-27 08:48:58 -04:00
John Chilton bb90ae93d8 More grt fixes - spotted by @nsoranzo. 2018-03-23 16:14:50 -04:00
John Chilton fea7953410 Remove two scripts - dataset purging hasn't worked this way for a very long time. 2018-03-23 16:14:49 -04:00
John Chilton 49fed72eea Drop data library whoosh/lucene scripts.
We don't set that config option in Galaxy anymore so these are broken anyway.
2018-03-23 16:14:49 -04:00
John Chilton 1911a55390 Remove unused and unuseful scripts. 2018-03-23 16:14:49 -04:00
John Chilton 16d821e12e Mark scripts/* that don't work with YAML configuraiton options as deprecated. 2018-03-23 16:14:49 -04:00
John Chilton 5f3f792f6f Unification of Galaxy configuration parsing for scripts/* 2018-03-23 16:14:49 -04:00
John Chilton 8fa8660b25 Small improvements to scripts/grt/export.py for testing.
- Don't rely on external sha256sum, use Python hashing (add utility to hash_util to enable this).
- Drop unused galaxy_config from grt.yml.sample - it isn't used anywhere as far as I can tell.
2018-03-23 16:14:49 -04:00
Nicola Soranzo 88e6e94a81 Merge branch 'release_18.01' into dev 2018-03-23 17:14:22 +00: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
Nate Coraor c720af066b Attempt to log startup as late as possible 2018-03-22 21:43:26 -04:00
John Chilton 6422955a22 Merge pull request #5669 from bgruening/propagate_tags_script
Add script for propagating hashtags in a Galaxy history
2018-03-20 15:43:28 -04:00
John Chilton 8316cb64b2 Merge pull request #5731 from martenson/botstrapdev
improve galaxy update commands, update some bootstrap checkpoints
2018-03-20 09:16:03 -04:00
Nicola Soranzo b2d7ca40d3 Fix typo 2018-03-19 18:10:04 +00:00
Nicola Soranzo 0cf88623ee Merge branch 'release_18.01' into dev 2018-03-19 17:52:05 +00:00
Nicola Soranzo 74d0bcb353 Merge branch 'release_17.09' into release_18.01 2018-03-19 17:50:57 +00:00
Martin Cech e310d7a1f0 improve galaxy update commands, update some checkpoints 2018-03-19 13:38:11 -04:00
Nicola Soranzo 3b87dac780 Add Galaxy lib directory to Python path for 2 scripts
Also fix check introduced in commit 0763cab37a .

Fix https://github.com/galaxyproject/galaxy/issues/5722 .
2018-03-19 14:53:19 +00: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
anup kumar 122384f33e Add print statements with brackets 2018-03-09 08:01:56 +01:00
anup kumar 81e971af1d Fix python lint errors 2018-03-09 07:45:22 +01:00
anup kumar 3b6f6b803e Merge branch 'dev' of https://github.com/bgruening/galaxy into propagate_tags_script 2018-03-08 21:38:46 +01:00
anup kumar ade6727fda Add script to propagate hashtags in history 2018-03-08 21:37:52 +01:00
John Chilton 1c6cc02415 Hierarchical upload API optimized for folders & collections.
Allows describing hierarchical data in JSON or inferring structure from archives or directories.

Datasets or archive sources can be specified via uploads, URLs, paths (if admin && allow_path_paste), library_import_dir/user_library_import_dir, and/or FTP imports. Unlike existing API endpoints, a mix of these on a per file basis is allowed and they work seemlessly between libraries and histories.

Supported "archives" include gzip, zip, bagit directories, bagit achives (with fetching and validations of downloads).

The existing upload API endpoint is quite rough to work with both in terms of adding parameters (e.g. the file type and dbkey hanlding in 4563 was difficult to implement, terribly hacky, and should seemingly have been trivial) and in terms of building requests (one needs to build a tool form - not describe sensible inputs in JSON). This API is built to be intelligable from an API standpoint instead of being constrained to the older style tool form. Additionally it built with hierarchical data in mind in a way that would not be easy at all enhancing the tool form components we don't even render.

This implements 5159 though much simpler YAML descriptions of data libraries should be possible basically as the API descriptions. We can replace the data library script in Ephemeris https://github.com/galaxyproject/ephemeris/blob/master/ephemeris/setup_data_libraries.py with one that converts a simple YAML file into an API call and allows many new options for free.

In future PRs I'll add filtering options to this and it will serve as the backend to 4733.
2018-03-08 10:33:36 -05:00
Nicola Soranzo 326a564eb9 Stop shipping old BeautifulSoup library 2018-03-07 01:19:55 +00:00
Nicola Soranzo e8b78cb62b Fix typos 2018-03-05 09:44:26 +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
John Chilton 5a31ac84ce Merge pull request #5436 from natefoo/dump-library-paths
A script for dumping library file paths for backup
2018-02-02 08:56:10 -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
Nate Coraor c7b6afbcd2 Add a script for dumping library file paths for backup 2018-02-01 13:05:16 -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
John Chilton e14dde16fb Merge pull request #5346 from mvdbeek/fix_hda_parent_access
Fix dataset purging, dataset cleanup script and db_shell script
2018-01-21 14:10:32 -05:00
mvdbeek 991f79e630 Use print() function in common_startup.sh 2018-01-21 13:24:07 +01:00
Marius van den Beek 8f65cd46b0 Merge pull request #5180 from bgruening/bam_unsorted
Add BamNative datatype
2018-01-19 16:37:36 +01:00