Commit Graph
27875 Commits
Author SHA1 Message Date
Dannon 41ed9d5c28 Merge pull request #12387 from guerler/add_tables_to_pages
Display Tabular datasets as sortable tables, and PDF and HTML in embedded frames in Pages
2021-08-31 15:45:57 -04:00
John Chilton e49f73aae4 Merge pull request #12390 from mvdbeek/fix_detached_instance_error
Keep separate session for ToolShedRepositoryCache
2021-08-31 14:07:47 -04:00
John Chilton d053cc2382 Merge pull request #12391 from davelopez/fastapi_url_for
FastAPI: support reverse URL lookups
2021-08-31 14:07:05 -04:00
Dannon 75a74bae71 Merge pull request #12351 from Nerdinacan/beta-history-selenium-updates
Beta history selenium updates and assorted bug fixes
2021-08-31 07:52:33 -04:00
mvdbeek c844410990 Keep separate session for ToolShedRepositoryCache
Should fix
```
Traceback (most recent call last):
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/jobs/runners/__init__.py", line 244, in prepare_job
    stderr_file=stderr_file,
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/jobs/runners/__init__.py", line 285, in build_command_line
    stderr_file=stderr_file,
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/jobs/command_factory.py", line 79, in build_command
    __handle_dependency_resolution(commands_builder, job_wrapper, remote_command_params)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/jobs/command_factory.py", line 194, in __handle_dependency_resolution
    if local_dependency_resolution and job_wrapper.dependency_shell_commands:
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/jobs/__init__.py", line 1012, in dependency_shell_commands
    job_directory=self.working_directory
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tools/__init__.py", line 1891, in build_dependency_shell_commands
    tool_instance=self
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/__init__.py", line 184, in dependency_shell_commands
    requirements_to_dependencies = self.requirements_to_dependencies(requirements, **kwds)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/__init__.py", line 194, in requirements_to_dependencies
    requirement_to_dependency = self._requirements_to_dependencies_dict(requirements, **kwds)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/__init__.py", line 283, in _requirements_to_dependencies_dict
    dependency = resolver.resolve(requirement, **kwds)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/resolvers/galaxy_packages.py", line 79, in resolve
    return self._find_dep_versioned(name, version, type=type, **kwds)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/resolvers/tool_shed_packages.py", line 25, in _find_dep_versioned
    path = self._get_package_installed_dependency_path(installed_tool_dependency, name, version)
  File "/cvmfs/test.galaxyproject.org/galaxy/lib/galaxy/tool_util/deps/resolvers/tool_shed_packages.py", line 43, in _get_package_installed_dependency_path
    tool_shed_repository = installed_tool_dependency.tool_shed_repository
  File "/cvmfs/test.galaxyproject.org/venv/lib/python3.6/site-packages/sqlalchemy/orm/attributes.py", line 480, in __get__
    return self.impl.get(state, dict_)
  File "/cvmfs/test.galaxyproject.org/venv/lib/python3.6/site-packages/sqlalchemy/orm/attributes.py", line 931, in get
    value = self.callable_(state, passive)
  File "/cvmfs/test.galaxyproject.org/venv/lib/python3.6/site-packages/sqlalchemy/orm/strategies.py", line 836, in _load_for_state
    % (orm_util.state_str(state), self.key)
sqlalchemy.orm.exc.DetachedInstanceError: Parent instance <ToolDependency at 0x7fd3e5e82160> is not bound to a Session; lazy load operation of attribute 'tool_shed_repository' cannot proceed (Background on this error at: http://sqlalche.me/e/14/bhk3)
```
Which I think broke in
https://github.com/galaxyproject/galaxy/pull/11737#discussion_r636354063.

Instead of hoping that we preload all attributes it seems more robust to
use a separate session for the cache that is not tied to a thread and
that will not be closed by flushes in other parts of the application.
2021-08-31 12:02:50 +02:00
Mason Houtz 8dccebbcc9 fixed test_workflow_run 2021-08-30 13:54:09 -07:00
davelopez 97a191c80c Adapt group_roles API to use new UrlBuilder
- Replace `url_for` with `trans.url_builder` that will handle the url generation in both legacy and FastAPI modes.
- Set `group_role` as unique name of the `FastAPIGroupRoles.show` route.
- Change `role_id` path parameter name to `id` to match the legacy route.
2021-08-30 21:12:17 +02:00
Mason Houtz 4973f5b9b7 fixed test_refresh_preserves_state 2021-08-30 09:11:08 -07:00
davelopez 22cd8eb549 Refactor QualifiedUrlBuilder to work also with relative URLs 2021-08-30 17:51:40 +02:00
Nicola Soranzo d7de9b3d5a Merge pull request #12380 from nuwang/drop_main_tool_conf
Remove tool_conf.xml.main which is no longer used
2021-08-30 14:10:07 +01:00
Mason Houtz 27bbb64569 test_workflow_run 2021-08-30 00:50:06 -07:00
Mason Houtz 938d807aff selenium test updates 2021-08-30 00:13:59 -07:00
Dannon 679995edb8 Merge pull request #12372 from mvdbeek/vgp_export_enhancement
Allow skipping sanitization of / char in export_remote tool
2021-08-29 17:29:00 -07:00
Dannon 8df71c277e Merge pull request #11957 from jj-umn/hexrd_datatypes
Add datatypes for Structural Materials Hexrd application
2021-08-29 16:51:08 -07:00
guerler 8bb21e5921 Display Tabular datasets as sortable tables with correct metadata headers in pages 2021-08-27 15:43:47 -04:00
Dannon a2bd1e1409 Merge pull request #12382 from Nerdinacan/fix-history-contents-api
Fixes to contents/near api endpoint
2021-08-27 11:20:19 -07:00
Mason Houtz 3c7b07ae58 removed non-ascii character from sample data in test 2021-08-26 11:37:00 -07:00
Mason Houtz b424ff2c22 reversed date comparison strategy to use naive dates in comparison 2021-08-26 11:07:21 -07:00
Mason Houtz 5ee9343c67 addd url encoding for ISO8601 date formats that javascript will never emit for testing purposes 2021-08-26 10:32:42 -07:00
Mason Houtz c965dd95a7 added more ISO8601 tests and removed manual parsing procedure 2021-08-26 09:56:21 -07:00
MasonandMarius van den Beek c1d4604151 Update lib/galaxy/model/migrate/versions/0177_update_job_state_summary.py
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
2021-08-26 07:49:12 -07:00
MasonandMarius van den Beek 569bffe976 Update lib/galaxy/model/migrate/versions/0177_update_job_state_summary.py
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
2021-08-26 07:49:05 -07:00
Jim Johnson 0610e2cee7 Update binary.py
Fix lint errors
2021-08-26 09:37:36 -05:00
Jim Johnson 7ebec8a7b4 Update string formats 2021-08-26 08:34:52 -05:00
melibleq 04f856a009 Small fix in binary.py
The EDAM annotation wasn't working there because it had been added as "format", instead of "data".
2021-08-26 10:31:37 -03:00
Mason Houtz 6499a8671e fixed since date parameter processing on contents/near 2021-08-25 16:17:06 -07:00
Björn Grüning 0c9add613e Merge pull request #12379 from jmchilton/config_per_host_static
Extend per_host configurations to include static directories and files.
2021-08-25 22:51:08 +02:00
John Chilton 232be653db Merge pull request #12381 from kxk302/rm-poolsize
Removing unused poolsize from code and config.
2021-08-25 16:45:31 -04:00
Mason Houtz 89c5b723b5 Fixed since parameter in contents/near 2021-08-25 13:12:06 -07:00
Mason Houtz c53a39b3af added api test for contents/near since parameter 2021-08-25 13:03:19 -07:00
Mason Houtz 5d4d5a8cad added migration for job state view 2021-08-25 12:18:51 -07:00
Dannon 025801fb9a Merge pull request #12378 from galaxyproject/dependabot/pip/lib/galaxy/dependencies/tensorflow-2.5.1
Bump tensorflow from 2.5.0 to 2.5.1 in /lib/galaxy/dependencies
2021-08-25 09:21:00 -07:00
Kaivan Kamali 3bf8e59b09 Removing unused poolsize from code and config. This seems to be stale code for a previous effort to manage connection pool size by Galaxy (which was abandoned) 2021-08-25 12:20:36 -04:00
Nuwan Goonasekera 944e28a507 Remove tool_conf.xml.main which is no longer used 2021-08-25 21:41:06 +05:30
mvdbeek ebf1e2435e Rename all_staging_paths to get_all_staging_paths 2021-08-25 19:03:34 +03:00
John Chilton 1765ed7c6d per host configurable static site configs 2021-08-25 12:01:40 -04:00
John Chilton 1a0cc6272d Abstraction to reduce duplication in build_url_map in webapp.py. 2021-08-25 12:01:40 -04:00
John Chilton c67232cdc5 Merge pull request #12328 from jmchilton/per_host_config
Allow various configuration parameters to be set per host.
2021-08-25 12:01:07 -04:00
Marius van den Beek eb0a9ff3d3 Merge pull request #12363 from kxk302/irods_healthcheck
Remove NetworkException catch clauses, so if irods server is down, NetworkException percolates up, preventing a silent failure and alerting us
2021-08-25 18:21:40 +03:00
Marius van den BeekandNuwan Goonasekera a8950564f4 Change method name to get_staging_path instead of staging_path
It's not a property anymore. Thanks Nuwan.

Co-authored-by: Nuwan Goonasekera <2070605+nuwang@users.noreply.github.com>
2021-08-25 18:05:43 +03:00
dependabot[bot] f958450978 Bump tensorflow from 2.5.0 to 2.5.1 in /lib/galaxy/dependencies
Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/tensorflow/tensorflow/releases)
- [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md)
- [Commits](https://github.com/tensorflow/tensorflow/compare/v2.5.0...v2.5.1)

---
updated-dependencies:
- dependency-name: tensorflow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-25 14:49:21 +00:00
Matthias Bernt 640eafa084 fix verify output for collections
For collections `planemo test` output for found file diff is `History item  different than expected...` which is not really helpful.

This PR adds the collection name and element identifier to the output.

Essentially a follow up to https://github.com/galaxyproject/galaxy/pull/9771
2021-08-25 12:50:23 +02:00
mvdbeek ee63fcc736 Allow skipping sanitization of / char
and allow using collection name as outer directory
2021-08-25 10:51:13 +03:00
davelopez 46afba301e Mark RelativeUrlField as deprecated in the schema 2021-08-24 18:26:14 +02:00
davelopez c7b996c2e7 Refactor roles and group_roles api to use the default url_for result 2021-08-24 14:54:38 +02:00
davelopez 4b75be4e8e Deprecate url_for in FastAPI routes
This generalizes the error handling when trying to call `url_for` in ASGI mode.
2021-08-24 10:46:28 +02:00
Nuwan Goonasekera bfe03bd4b9 Fix variable name typo in watchers 2021-08-21 21:25:17 +05:30
Kaivan Kamali c041a750b5 Removed healthcheck related code 2021-08-20 16:53:06 -04:00
Kaivan Kamali 200d5b384e Removed catch clause for NetworkException in irods.py, so if irods server is down, the exception percolates up. 2021-08-20 15:53:50 -04:00
Kaivan Kamali a1399ce146 Added healthcheck to irods object store 2021-08-19 15:40:33 -04:00