Commit Graph
29837 Commits
Author SHA1 Message Date
John Chilton d3b272fd10 Merge pull request #13170 from mvdbeek/max_discovered_files
Limit maximum number of discovered files per job
2022-01-18 12:45:01 -05:00
David López 8f72ec5efb Merge pull request #12099 from knutwa-ext/iml_dataset_branch
Add datatype iml_dataset subclassing html
2022-01-18 16:08:35 +01:00
mvdbeek 26a98ae8f4 Implement max_discovered_files 2022-01-18 11:49:00 +01:00
David López 2817fdb5b3 Simplify html extension check
Simplified the check a bit here since `endswith` will cover the previous check and also I've removed the preceding `.` to make sure the old check is still covered.
2022-01-18 11:39:34 +01:00
mvdbeek 9dcea35ae5 Show yaml files in preview
The `application/yaml` mediatype might be the logical mediatype for yaml
(there's no standard yet), but we want to see a textual preview (in the
absence of a viewer).
Fixes https://github.com/galaxyproject/galaxy/issues/13168
2022-01-17 19:10:49 +01:00
mvdbeek 7c4568fe90 Set collection update_time when replacing failed elements
That allows the new history to update the collection.
2022-01-17 18:59:40 +01:00
mvdbeek 8a16c56cac Fix re-run with rerun_remap_job_id hiding collection
Fixes https://github.com/galaxyproject/galaxy/issues/13052
2022-01-17 18:59:39 +01:00
Matthias Bernt c37dcd1e98 add TODO for later 2022-01-17 11:07:48 +01:00
Matthias Bernt 16070ccbb5 full test coverage for tests linter 2022-01-17 11:07:48 +01:00
Matthias Bernt 706048c62f full test coverage for outputs linter
- fix warning for invalid cheetah placeholder
2022-01-17 11:07:48 +01:00
Matthias Bernt f699676534 full test coverage for command linter
- info->warn for deprecated interpreter attribute
- add error for empty command text
- fix check for TODO in command
2022-01-17 11:07:48 +01:00
Matthias Bernt 994cc17156 full test coverage for citations linter
- and add warning if no valid citation is found
2022-01-17 11:07:48 +01:00
Matthias Bernt 9d7f3a1d25 full test coverage for stdio 2022-01-17 11:07:48 +01:00
Matthias Bernt 5b34abf81f fix rebase error 2022-01-17 11:07:48 +01:00
Matthias Bernt 96f0e72887 full coverage of inputs linter
and several small improvements

- lint for empty param name / type
- distinct option definition possibilities for selects and selects in
conditionals
- condtional parameter
  - check for exactly 1 conditional param (before only 0)
  - warn if boolean select param for conditional
  - warn for optional and multiple select
2022-01-17 11:07:48 +01:00
Matthias Bernt 93b417643e general linter: full test coverage
- more specific error message for whitespace in pre/suffix in tool
version and name
- do not pront valid tool id message if whitespaces are found
2022-01-17 11:06:10 +01:00
Matthias Bernt d2903f2ba7 check tool_id only if present 2022-01-17 11:05:09 +01:00
Matthias Bernt fd3cc41678 small fix for tests linter 2022-01-17 11:03:49 +01:00
Matthias Bernt 109051935f add xpath 2022-01-17 11:03:49 +01:00
Matthias Bernt a7edfaac1b remove bare excepts 2022-01-17 11:03:06 +01:00
Matthias Bernt 96654f8882 provide more context for lint context
line number and xpath
2022-01-17 11:03:06 +01:00
Dannon 1a4b19a726 Merge pull request #13121 from gregvonkuster/destid_reports
Add job reports for node types and execution times
2022-01-14 22:21:24 -05:00
Marius van den Beek f33fe93bde Merge pull request #13094 from bernt-matthias/topic/duplicated_option
Allow duplicated static options
2022-01-14 19:34:14 +01:00
Marius van den Beek 03ed4c6a8d Merge pull request #13165 from ic4f/dev_backref_to_backpopulates
Replace backref with back_populates
2022-01-14 18:39:21 +01:00
davelopez 9500c2dbb7 Merge branch 'dev' into iml_dataset_branch 2022-01-14 17:29:26 +01:00
David López 434ef6fa3b Use lowercase true in XML 2022-01-14 17:02:34 +01:00
Marius van den Beek 66fafe872b Merge pull request #13080 from kxk302/resource_name
Fix issue with uploading cached file to irods
2022-01-14 16:18:11 +01:00
Marius van den Beek 247d7156db Merge pull request #12698 from ic4f/dev_sa20prep_1
Misc. fixes for SQLAlchemy 2.0
2022-01-14 15:45:11 +01:00
Marius van den Beek 6fdf4da441 Merge pull request #13039 from bernt-matthias/topic/filter-param-value-multiple
Allow param_value filter to refer to parameters with multiple values
2022-01-14 15:25:44 +01:00
John Chilton 25d7755204 Merge pull request #13167 from bernt-matthias/topic/workflow_schedulers_macros
enable macros for workflow scheduler config
2022-01-14 09:19:57 -05:00
Matthias Bernt d71981d451 enable macros for workflow scheduler config
https://github.com/galaxyproject/galaxy/issues/10179
2022-01-14 11:58:49 +01:00
Sergey Golitsynskiy 2dbf38306a Replace backref with back_populates 2022-01-13 17:00:10 -05:00
Sergey Golitsynskiy 1f76a365af Drop tool migration derivatives from backend 2022-01-13 13:52:59 -05:00
Sergey Golitsynskiy 520b3eadce Drop unused TOOL_MIGRATION_VERSIONS_DIR 2022-01-13 13:48:14 -05:00
Sergey Golitsynskiy 5e515a8dbf Remove tool migrations selenium selector 2022-01-13 13:39:21 -05:00
Sergey Golitsynskiy e496cd0ac2 Remove tool migrations api end points 2022-01-13 13:31:22 -05:00
Sergey Golitsynskiy 32c8515d44 Drop unused import 2022-01-13 11:49:22 -05:00
mvdbeek 7a4d31feee Drop refresh argument of get_installed_repository 2022-01-13 11:38:56 -05:00
Marius van den Beek 2ecae06a83 Don't need to use a joinedload anymore
The cache is only used on startup, not during dependency resolution.
Also rename _rebuild, since we only use it once now.
2022-01-13 11:38:54 -05:00
mvdbeek 4b579c34c6 Limit lifetime of repository cache 2022-01-13 11:38:23 -05:00
Kaivan Kamali 7cd6c2b15d Merge branch 'dev' into resource_name 2022-01-13 10:45:52 -05:00
Sergey Golitsynskiy df6cf535a2 Fix RemoveIn20Warning: Query.join(str)
RemovedIn20Warning: Using strings to indicate relationship names in Query.join() is deprecated and will be removed in SQLAlchemy 2.0.  Please use the class-bound attribute directly.
2022-01-12 17:02:33 -05:00
Sergey Golitsynskiy 74cc259bc0 Fix RemovedIn20Warning: engine.execute 2022-01-12 16:40:18 -05:00
Sergey Golitsynskiy 0dc8e3f30d Fix RemoveIn20Warning: do not autocommit (note)
test/unit/data/model/test_mapping.py: 12 warnings
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/migrate/versions/util.py:204: RemovedIn20Warning: The current statement is being autocommitted using implicit autocommit, which will be removed in SQLAlchemy 2.0. Use the .begin() method of Engine or Connection in order to use an explicit transaction for DML and DDL statements. (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
    connection.execute(cmd)
2022-01-12 13:51:09 -05:00
Sergey Golitsynskiy daeb6cd42b Fix RemovedIn20Warning: engine.execute() (note)
test/unit/data/model/test_mapping.py::TestCleanupEvent::test_table
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/view/utils.py:80: RemovedIn20Warning: The Engine.execute() method is considered legacy as of the 1.x series of SQLAlchemy and will be removed in 2.0. All statement execution in SQLAlchemy 2.0 is performed by the Connection.execute() method of Connection, or in the ORM by the Session.execute() method of Session. (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
    engine.execute(CreateView(view.name, view.__view__))

https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#execute-method-more-strict-execution-options-are-more-prominent
2022-01-12 13:51:09 -05:00
Sergey Golitsynskiy 99e0c5cf75 Fix RemovedIn20Warning: use method chaining in select (see note)
lib/galaxy/model/__init__.py:8937
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/__init__.py:8937: RemovedIn20Warning: The legacy calling style of select() is deprecated and will be removed in SQLAlchemy 2.0.  Please use the new calling style described at select(). (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
    exists([HistoryDatasetCollectionAssociation.id], and_(

lib/galaxy/model/__init__.py:8945
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/__init__.py:8945: RemovedIn20Warning: The legacy calling style of select() is deprecated and will be removed in SQLAlchemy 2.0.  Please use the new calling style described at select(). (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
    exists([HistoryDatasetAssociation], and_(

Ref: https://docs.sqlalchemy.org/en/14/errors.html#select-construct-created-in-legacy-mode-keyword-arguments-etc
2022-01-12 13:51:09 -05:00
Sergey Golitsynskiy effe59a60f Fix RemovedIn20Warning for views (see note)
Why we are using a separate registry and not the one containing all
models: see inline comment in parent View class)

lib/galaxy/model/view/__init__.py:70
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/view/__init__.py:70: RemovedIn20Warning: Calling the mapper() function directly outside of a declarative registry is deprecated. Please use the sqlalchemy.orm.registry.map_imperatively() function for a classical mapping. (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9)
    mapper(HistoryDatasetCollectionJobStateSummary, HistoryDatasetCollectionJobStateSummary.__table__)
2022-01-12 13:51:09 -05:00
Sergey Golitsynskiy 67977bc394 Restructure HDCJSS view in model/view 2022-01-12 13:51:09 -05:00
Matthias Bernt 2e33be78ac make param_value filter work with multi data inputs
ie data with multiple=true and collections
2022-01-11 15:54:42 +01:00
Matthias Bernt dddf201177 remove debug messages 2022-01-11 15:54:42 +01:00