Commit Graph
1860 Commits
Author SHA1 Message Date
Daniel Blankenberg e4dd821d7f Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-07-07 17:54:48 +02:00
Nate Coraor 118e01f796 Don't show the pip progress bar when installing under CI 2019-07-07 14:22:07 +02:00
Nate Coraor 2034980b77 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into installable 2019-07-07 13:50:41 +02:00
John Chilton d194520fdf Merge pull request #8152 from jmchilton/tool_deps_serialize
Re-try dependency manager serialization and embedded config.
2019-07-07 12:44:35 +02:00
Sergey Golitsynskiy 1694b79185 Update import paths for loader_directory 2019-07-06 00:52:45 +02:00
Daniel Blankenberg f231e42c48 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-07-05 16:43:01 +02:00
Nate Coraor 37522f5e8e Merge branch 'dev' of https://github.com/galaxyproject/galaxy into installable 2019-07-05 16:05:17 +02:00
Nate Coraor cdb9040e26 Merge remote-tracking branch 'origin/dev' into installable 2019-07-05 15:51:15 +02:00
John Chilton 584c117df3 Refactor to cleanup dependencies around galaxy.web.stack.
Move galaxy.web.stack.database_heartbeat into galaxy.model - since it was the only thing in galaxy.web.stack that used galaxy.model at all and it didn't import anything else from galaxy.web.stack.

Once that was done, I refactored this whole package (galaxy.web.stack) into galaxy.web_stack. It doesn't use the framework setup or exported by the base galaxy.web package so it wouldn't seem to belong there. It also has very different dependencies than the rest of that. And finally and most importantly, this elimiantes almost all dependency from galaxy.jobs and galaxy.tools and galaxy.workflows to anything in galaxy.web.
2019-06-26 18:54:52 -04:00
John Chilton 450ae76ddb Re-try dependency manager serialization and embedded config.
PR #8118 - adding to_dict to the dependency manager and an embedded loading of dependency resolution options from galaxy.yml - was really quite poorly thought through.

Certain options could be embedded - but only the resolvers and the actual dictified representation of the DependencyManager couldn't be actually embedded properly in the app config - but this is exactly what I wanted to do on the Pulsar side and it would make no sense to have the exact same options in both apps and configured differently.

So now the actual dictified representation of the whole DependencyManager can be directly embedded in galaxy.yml as the ``dependency_resolution:`` parameter. All the parameters can still be configured at the top level of the YAML file but with 'dependency' in the config option name (some prefixes, some suffixes, etc... a hodgepodge that has grown organically). Give the messiness of the existing options might be better to encourage using ``dependency_resolution:`` in the future.
2019-06-20 14:36:40 -04:00
Daniel Blankenberg 540b2b386b Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-06-17 09:02:21 -04:00
Nicola Soranzo 90a6c6d46b Fix issues reported by ShellCheck 2019-06-13 12:53:26 +01:00
John Chilton 344055c4d2 Merge pull request #8098 from jmchilton/tool-util-expand
Migrate XSD into galaxy-tool-util.
2019-06-12 10:48:59 -04:00
Nicola Soranzo 1fd248311f Fix traceback in `printquery()`
Fix the following traceback:

```
/usr/users/ga002/soranzon/software/galaxyproject_galaxy/scripts/db_shell.py in printquery(statement, bind)
     60         if bind is None:
     61             bind = statement.session.get_bind(
---> 62                 statement._mapper_zero_or_none())
     63         statement = statement.statement
     64     elif bind is None:

AttributeError: 'Query' object has no attribute '_mapper_zero_or_none'
```

due to the removal of `_mapper_zero_or_none()` in SQLAlchemy commit
https://github.com/sqlalchemy/sqlalchemy/commit/234a5b9723fbbb9747c0f9e3917baf8500b73370
2019-06-11 11:31:40 +01:00
Dannon 0bbcb4fe40 Merge pull request #8047 from jmchilton/pages_api_and_component
Toward a more modern frontend and backend for Pages.
2019-06-10 09:08:48 -04:00
Daniel Blankenberg ccc4fc482f Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-06-06 17:39:45 -04:00
John Chilton 2fb06e7cc0 Skip client build when validating test tools, unneeded. 2019-06-05 16:46:52 -04:00
John Chilton fb7efea6ba Move tool XSD into galaxy-tool-util package. 2019-06-05 16:46:52 -04:00
Martin Cech 20bdd5867a Merge branch 'release_19.05' into dev 2019-06-05 16:35:35 -04:00
Martin Cech d6a26e1ba5 enhance repository search API capabilities
* include categories as keywords for repository index
* allow filtering on category/owner using github-like wildards "category:name"
* only log metadtaa like matched terms, do not return in http response
* refactoring
2019-05-29 16:17:09 -04:00
John Chilton ead233c0c1 clean-fix-page-api - move page revision creation to manager. 2019-05-29 13:43:49 -04:00
Martin Cech fd82ec013b repo search - prefix hash with changeset number, stringify as list 2019-05-28 11:38:16 -04:00
John Chilton 038d78a8f6 Fixes and enhancements for release note generation.
- Auto-bootstrap user announcements for datatypes, tools, and viz. (follow up on #7527)
- Many fixes for things broken in #7527
- Treat procedures as an enhancment for categorizing things.
- Speed up release note generation a bit by not considering really, really old PRs.
2019-05-24 16:59:32 -04:00
Martin Cech 0706a7ea24 add repo lineage to search results, lower limit to 1 char 2019-05-24 16:05:15 -04:00
Martin Cech 93609f4e68 include repo changeset history in the search index
unicodify the lineage string
2019-05-24 16:05:09 -04:00
Daniel Blankenberg 98f7fd7a92 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into rtt-tmp 2019-05-21 07:55:06 -04:00
Dannon f6011bab5b Merge pull request #7992 from jmchilton/more_packages
Add galaxy-tool-util and galaxy-job-metrics packages.
2019-05-20 16:36:11 -04:00
Daniel Blankenberg d1f1391001 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-05-20 10:03:21 -04:00
Marius van den Beek a71a44b2de Merge pull request #8003 from galaxyproject/release_19.01
Merge 19.01 into 19.05
2019-05-19 15:12:01 +02:00
Nate Coraor bd06628a3d Fix use of pgcleanup's purge_deleted_users when there are no users to
purge
2019-05-17 16:37:19 -04:00
Nate Coraor a6e0158672 Merge remote-tracking branch 'upstream/release_19.01' into release_19.05 2019-05-17 13:32:42 -04:00
Nate Coraor fc027182f7 Fix variable name for work mem in pgcleanup.py 2019-05-17 11:30:40 -04:00
John Chilton 939e7774a8 Create galaxy-tool-util package.
This is (so far a subset of) the tool utilities from galaxy-lib. galaxy-lib mocked out a fake galaxy.tools to allow these to all exist below the galaxy.tools - but this was a terrible hack - in order for the new packages to be true subsets of Galaxy they need to be refactored into a new package that doesn't depend on models, SA, galaxy.jobs, etc...

[x] galaxy.tools.deps -> galaxy.tool_util.deps
[x] galaxy.tools.loader -> galaxy.tool_util.loader
[x] galaxy.tools.cwl -> galaxy.tool_util.cwl
[x] galaxy.tools.loader -> galaxy.tool_util.loader
[x] galaxy.tools.fetcher -> galaxy.tool_util.fetcher
[x] galaxy.tools.locations -> galaxy.tool_util.locations
[x] galaxy.tools.parser -> galaxy.tool_util.parser
2019-05-16 16:45:25 -04:00
Daniel Blankenberg f164db2d25 Merge branch 'dev' of https://github.com/blankenberg/galaxy into realtimetools 2019-05-09 15:22:13 -04:00
John Chilton b09f48978e Merge pull request #7830 from erasche/grt-tiny-fix
grt small bugfix for ancient data, deprecated params table
2019-04-26 10:56:21 -04:00
Helena Rasche 1b6b52ce10 swap to exception 2019-04-26 13:29:12 +02:00
Helena Rasche c54bddd3f3 it is pointless to load sample config 2019-04-26 13:27:59 +02:00
Helena Rasche cb7b26e25e Remove now-deprecated params + more defensive 2019-04-26 13:20:37 +02:00
Helena Rasche dcfff4d5de ensure a string is returned
Very old values in EU db were missing this.
2019-04-26 13:20:26 +02:00
Nicola Soranzo d53112aa43 Use `yaml.safe_load() instead of load()`
See https://msg.pyyaml.org/load
2019-04-23 16:50:55 +01:00
Nicola Soranzo 0faa479f94 Fix deprecated `getchildren()`
See https://docs.python.org/2/library/xml.etree.elementtree.html#xml.etree.ElementTree.Element.getchildren
2019-04-23 12:51:13 +01:00
Daniel Blankenberg ae312d74b4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-04-16 13:56:19 -04:00
Nicola Soranzo 1b1f6e9cda Fix comments 2019-04-14 18:02:42 +01:00
Daniel Blankenberg 73e81accae Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-04-02 16:31:54 -04:00
mvdbeek c8392299c8 Make processes and mules report heartbeat in database
It's important to not set the DatabaseHeartbeat `server_name` prior to forking,
which we avoid be getting `server_name` from
`application_stack.app.config.server_name`.
`WorkerProcess.server_name` for uwsgi web processes will look like:
`main.web.1` and mules like `main.job-handlers.1` while webless workers
remain named `handler1`.
2019-03-29 21:46:18 +01:00
Daniel Blankenberg 7f175ac1f5 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into realtimetools 2019-03-27 11:48:56 -04:00
Dannon Baker 485eece7f3 Grammatical tweaks. 2019-03-26 09:31:33 -04:00
Dannon Baker 8bb2b6bfbc Add extra verbosity covering non-client-building branches in startup. 2019-03-26 09:04:45 -04:00
Daniel Blankenberg 0a6e4bbda5 Revert "move realtime rpc script to /scripts/realtime/"
This reverts commit 9ee4b9c4e2.
2019-03-22 15:29:58 -04:00
Daniel Blankenberg 9ee4b9c4e2 move realtime rpc script to /scripts/realtime/ 2019-03-22 15:27:47 -04:00