Commit Graph
1368 Commits
Author SHA1 Message Date
Nicola Soranzo d5633f6285 Enable on-screen logging for create_db.py and manage_db.py 2019-08-18 11:17:34 +01:00
John Chilton e611797a77 Merge pull request #8470 from erasche/fix-975
Fix #975
2019-08-16 14:42:24 -04:00
Helena Rasche 5f615168bc Fix #975 2019-08-16 15:11:15 +02:00
Helena Rasche b316bab722 Remove scripts deprecated since 1 year 2019-08-15 14:30:53 +02:00
John Chilton 47d46c626e Merge pull request #8452 from erasche/faster-quota
Replace in-python quota calc with a SQL query
2019-08-14 14:40:12 -04:00
Helena Rasche 887aae2ab3 Refactor into model 2019-08-14 16:15:49 +02:00
Helena Rasche 58f4f65a4a new method 2019-08-14 16:08:04 +02:00
Dannon Baker 877bd322d6 Add pointer to client/README.md to address 'https://github.com/galaxyproject/galaxy/commit/8bb2b6bfbcac89910ec6b5cc58e23243571ab879#commitcomment-34259049' 2019-08-14 09:59:55 -04:00
Nate Coraor 395d98857b Fix config file finding for the manage_db script 2019-08-07 16:33:40 -04:00
M Bernt f6ff679d63 cleanup: use logging instead of print 2019-08-01 09:25:13 +02:00
Martin Cech 00600e4006 Merge pull request #8298 from jmchilton/selenium_package
Create galaxy-selenium package.
2019-07-18 15:17:42 -04:00
Nicola Soranzo e7165c37e3 Fix issues reported by shellcheck 2019-07-17 12:46:46 +01:00
Nicola Soranzo 8e8c64308a Fix use of `PIP_PROGRESS_BAR` env variable
`PIP_PROGRESS_BAR` environment variable is used by `pip` to set the value
for the `--progress-bar` option. It seems that specifying it also only the
command line does not override it in some configurations, e.g. on TravisCI
Linux builds of BioBlend, see e.g.

https://travis-ci.org/galaxyproject/bioblend/jobs/558857557
2019-07-16 17:17:32 +01:00
Martin Cech e45d7959a7 Merge pull request #8308 from jmchilton/push_scripts_into_subpackages
Push galaxy-meta scripts into appropiate subpackages.
2019-07-15 18:45:13 -04:00
Marius van den Beek d22d7beaf4 Merge pull request #8305 from jmchilton/axe_log_tempfile
Remove log_tempfile.
2019-07-09 14:42:43 +02:00
Marius van den Beek 64c71ca7e1 Merge pull request #8290 from natefoo/remove-ci-pip-progress-bar
Don't show the pip progress bar when installing under CI
2019-07-09 12:17:49 +02:00
John Chilton 9b287ef06c Push scripts into subpackages. 2019-07-08 16:38:10 +02:00
John Chilton 753a151c76 Add dump tour script to galaxy-selenium package. 2019-07-08 15:48:19 +02:00
John Chilton 8a327db74d Remove log_tempfile.
Simplify packaging - @natefoo said I could.
2019-07-08 14:52:13 +02:00
Nate Coraor 906413d07b Rework config locating logic (it was reading the sample again). 2019-07-08 11:28:31 +02:00
Nate Coraor d65e3c904e Fix galaxy-main running from source now that setup,py is no longer in the root 2019-07-07 18:23:49 +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
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
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
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
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
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
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