Commit Graph
59414 Commits
Author SHA1 Message Date
Sergey Golitsynskiy 823ba91110 Use class attr in load options (_subcontainer_id_map) 2022-03-16 16:16:39 -04:00
Sergey Golitsynskiy 20f6e8d7a1 Use text() to wrap sql 2022-03-16 15:16:06 -04:00
Sergey Golitsynskiy ad0c79e0a9 Row.keys() removed in 2.0: use _fields instead; adjust test
Ref: https://docs.sqlalchemy.org/en/14/core/connections.html?highlight=row#sqlalchemy.engine.Row.keys
2022-03-16 15:12:27 -04:00
Sergey Golitsynskiy 0963a02fb9 Use class attr in load options (all_roles()) 2022-03-16 15:05:35 -04:00
Sergey Golitsynskiy c2bee38662 Use text() to wrap sql string
Fixes RemovedIn20Warning
Ref: https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#execute-method-more-strict-execution-options-are-more-prominent
2022-03-16 14:40:24 -04:00
Sergey Golitsynskiy 25985fc991 Use class attributes instead of strings in load options
Fixes multiple instances of RemovedIn20Warning
Joining / loading on relationships uses attributes, not strings
Ref: https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#orm-query-joining-loading-on-relationships-uses-attributes-not-strings
2022-03-16 14:24:58 -04:00
John Chilton 427847bcc4 Fix up some import "issues". 2022-03-16 14:22:50 -04:00
John Chilton d4b1b1625a Merge pull request #13476 from jmchilton/no_implicit_reexport
Disable implicit re-imports across the project.
2022-03-16 14:04:31 -04:00
Nicola Soranzo bad8ecbda2 Merge pull request #13554 from mvdbeek/fix_sff_extractor_tool 2022-03-16 18:00:25 +00:00
Sergey Golitsynskiy 63e613436d Fix implicit exection and autocommit (both removed in 2.0)
Ref:
https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#library-level-but-not-driver-level-autocommit-removed-from-both-core-and-ormo
https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#implicit-and-connectionless-execution-bound-metadata-removed

Exposed by the following tests:

test/unit/data/model/test_model_discovery.py::test_model_create_context_persist_hdas
test/unit/data/model/test_model_discovery.py::test_model_create_context_persist_error_hda
test/unit/data/model/test_model_discovery.py::test_persist_target_library_dataset
test/unit/data/model/test_model_discovery.py::test_persist_target_library_folder
test/unit/data/model/test_model_discovery.py::test_persist_target_hdca
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/triggers/utils.py:8: RemovedIn20Warning: The DDLElement.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)
    cmd.execute(bind=engine)

test/unit/data/model/test_model_discovery.py::test_model_create_context_persist_hdas
test/unit/data/model/test_model_discovery.py::test_model_create_context_persist_error_hda
test/unit/data/model/test_model_discovery.py::test_persist_target_library_dataset
test/unit/data/model/test_model_discovery.py::test_persist_target_library_folder
test/unit/data/model/test_model_discovery.py::test_persist_target_hdca
  /home/sergey/0dev/galaxy/_galaxy/dev/lib/galaxy/model/triggers/utils.py:8: 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)
    cmd.execute(bind=engine)
2022-03-16 12:16:43 -04:00
Sergey Golitsynskiy 41d7cf20e4 Merge pull request #13541 from ic4f/dev_13376_migration
Add source_metadata column to workflow table as alembic revision
2022-03-16 11:01:25 -04:00
mvdbeek e2d43806dc Fix `sff_extract` tool, drop type annotation
I don't think this tool is really used much, but it is loaded in
`tool_conf.xml`.
https://github.com/galaxyproject/galaxy/pull/11877 added type
annotations, and that's a syntax error on 2.7

The alternative would be to fix the rest of the tool for 3.x,
but I think we're just wasting our time there and we shouldn't
touch this again.
2022-03-16 15:24:55 +01:00
mvdbeek cf359f0b87 Fix extended_metadata jobs with dce inputs
This broke when we started re-exporting jobs to update their command
line in https://github.com/galaxyproject/galaxy/pull/12459/commits/65e0ee213ae574bc0a45dfcc60e997863ff96a7c#diff-bfb854f344e56a25a86761f80a639de09add404a7a53ebde45afb908762fc1eaR161:

```
ERROR    galaxy.jobs:__init__.py:1836 problem importing job outputs. stdout [] stderr [
Traceback (most recent call last):
  File "metadata/set.py", line 1, in <module>
    from galaxy_ext.metadata.set_metadata import set_metadata; set_metadata()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/metadata/set_metadata.py", line 121, in set_metadata
    set_metadata_portable()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/metadata/set_metadata.py", line 307, in set_metadata_portable
    export_store.export_job(job, include_job_data=False)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 1320, in export_job
    self.export_jobs([job], include_job_data=include_job_data)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 1336, in export_jobs
    job_attrs = job.serialize(self.security, self.serialization_options)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/__init__.py", line 339, in serialize
    return self._serialize(id_encoder, serialization_options)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/__init__.py", line 1447, in _serialize
    params_objects = remap(params_objects, remap_objects)
  File "/home/runner/work/galaxy/galaxy/galaxy root/.venv/lib/python3.7/site-packages/boltons/iterutils.py", line 1128, in remap
    visited_item = visit(path, key, value)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/__init__.py", line 1441, in remap_objects
    new_id = serialization_options.get_identifier_for_id(id_encoder, obj["id"])
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/__init__.py", line 323, in get_identifier_for_id
    raise NotImplementedError()
NotImplementedError
]
```

To test run `GALAXY_CONFIG_METADATA_STRATEGY=extended ./run_tests.sh
-api
lib/galaxy_test/api/test_jobs.py::JobsApiTestCase::test_dce_submission_security`
2022-03-16 13:44:07 +01:00
mvdbeek 880c129fa5 Fix creating tags within sessionless context
xref: https://github.com/galaxyproject/galaxy/issues/13551, fixes
```
galaxy.jobs ERROR 2022-03-15 00:21:29,515 [pN:main,p:2180,tN:LocalRunner.work_thread-3] problem importing job outputs. stdout [] stderr [
Traceback (most recent call last):
  File "metadata/set.py", line 1, in <module>
    from galaxy_ext.metadata.set_metadata import set_metadata; set_metadata()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/metadata/set_metadata.py", line 121, in set_metadata
    set_metadata_portable()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/metadata/set_metadata.py", line 291, in set_metadata_portable
    collect_dynamic_outputs(job_context, output_collections)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/job_execution/output_collect.py", line 147, in collect_dynamic_outputs
    persist_elements_to_hdca(job_context, elements, hdca, collector=DEFAULT_DATASET_COLLECTOR)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/discover.py", line 719, in persist_elements_to_hdca
    filenames,
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/discover.py", line 292, in populate_collection_elements
    final_job_state=final_job_state,
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/discover.py", line 354, in _populate_elements
    self.add_tags_to_datasets(datasets=element_datasets["datasets"], tag_lists=element_datasets["tag_lists"])
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/discover.py", line 576, in add_tags_to_datasets
    self.tag_handler.add_tags_from_list(user, dataset, tags, flush=False)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 61, in add_tags_from_list
    return self.set_tags_from_list(user, item, new_tags_set, flush=flush)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 75, in set_tags_from_list
    self.apply_item_tags(user, item, unicodify(new_tags_str, "utf-8"), flush=flush)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 207, in apply_item_tags
    self.apply_item_tag(user, item, name, value, flush=flush)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 179, in apply_item_tag
    tag = self._get_or_create_tag(lc_name)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 281, in _get_or_create_tag
    tag = self._create_tag(scrubbed_tag_str)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 246, in _create_tag
    tag = self._create_tag_instance(tag_name)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 428, in _create_tag_instance
    tag = super()._create_tag_instance(tag_name)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/tags.py", line 259, in _create_tag_instance
    Session = sessionmaker(self.sa_session.bind)
AttributeError: 'NoneType' object has no attribute 'bind'
]
Traceback (most recent call last):
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/jobs/__init__.py", line 1828, in finish
    import_model_store.perform_import(history=job.history, job=job)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 209, in perform_import
    datasets_attrs = self.datasets_properties()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 930, in datasets_properties
    datasets_attrs = load(open(datasets_attrs_file_name))
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/tmp19s6x278/tmpt0rr8vmw/tmp2mjq6ysx/database/job_working_directory1/000/7/metadata/outputs_populated/datasets_attrs.txt'
galaxy.jobs.runners ERROR 2022-03-15 00:21:29,516 [pN:main,p:2180,tN:LocalRunner.work_thread-3] (7/) Job wrapper finish method failed
Traceback (most recent call last):
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/jobs/runners/__init__.py", line 594, in _finish_or_resubmit_job
    job_stderr=job_stderr,
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/jobs/__init__.py", line 1828, in finish
    import_model_store.perform_import(history=job.history, job=job)
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 209, in perform_import
    datasets_attrs = self.datasets_properties()
  File "/home/runner/work/galaxy/galaxy/galaxy root/lib/galaxy/model/store/__init__.py", line 930, in datasets_properties
    datasets_attrs = load(open(datasets_attrs_file_name))
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/tmp19s6x278/tmpt0rr8vmw/tmp2mjq6ysx/database/job_working_directory1/000/7/metadata/outputs_populated/datasets_attrs.txt'
```
2022-03-16 11:32:06 +01:00
mvdbeek c6cdf5b247 Fix tool shed tests 2022-03-16 11:12:35 +01:00
Marius van den Beek 4b3c94822a Merge pull request #13545 from dannon/history-expand-animation
Card expansion animation in new history
2022-03-16 10:19:48 +01:00
John Chilton 31e15bc03c Fix cwltool imports to not rely on implicit re-exports. 2022-03-15 19:58:42 -04:00
John Chilton 4dae7c6f21 Disable implicit re-imports across the projects.
Exclude galaxy.util for now, but the exclusion is tracked in setup.cfg. Elimiantes a bunch of flake exception markers.
2022-03-15 19:58:42 -04:00
John Chilton 8a27ff1df1 Merge pull request #13549 from jmchilton/broken_merge
Fix broken merge.
2022-03-15 19:58:32 -04:00
Marius van den Beek 1b2c127f65 Merge pull request #13550 from ic4f/release_22.01_releasenotes
Remove duplicate names
2022-03-15 23:09:51 +01:00
Sergey Golitsynskiy cfb8dd1a8c Remove duplicate names 2022-03-15 18:03:00 -04:00
John Chilton a132cf5892 Fix broken merge. 2022-03-15 17:40:46 -04:00
mvdbeek 7a72fe5756 Drop "starting galaxy" docs
They're outdated and changing rapidly. Without context I don't think
they're all that helpful.
2022-03-15 21:59:21 +01:00
mvdbeek d7ddc95943 Drop init scripts that are likely unused 2022-03-15 21:59:21 +01:00
mvdbeek 7ea87efbf8 Clean up unit tests 2022-03-15 21:59:21 +01:00
mvdbeek 40ef441d0f Clean up run.sh 2022-03-15 21:59:21 +01:00
mvdbeek b234946951 Drop web_compat.py 2022-03-15 21:59:20 +01:00
mvdbeek 12bcbcc333 Drop legacy app_factory fallback 2022-03-15 21:59:20 +01:00
mvdbeek 7242ccae94 Drop galaxy_vscode.ini
It's long been possible to use galaxy.yml for running galaxy inside of
vscode.
2022-03-15 21:59:20 +01:00
mvdbeek 399057134e Drop unused app_factory 2022-03-15 21:59:20 +01:00
mvdbeek e17c22ed2a Debug failure to start in GravityWrapper 2022-03-15 21:32:01 +01:00
mvdbeek 87170651af Drop uwsgi section from unit test test config files 2022-03-15 21:32:00 +01:00
mvdbeek 945ecca943 Run interactivetool tests against a gravity config 2022-03-15 21:32:00 +01:00
mvdbeek 9277af6657 Raise exception when waiting for entry point
There's a retry loop, I suppose it was meant to be used that way.
2022-03-15 21:32:00 +01:00
mvdbeek 9b735304c0 Fix get_ip on OSX 2022-03-15 21:32:00 +01:00
mvdbeek fd51314a88 Drop more uWSGI legacy things 2022-03-15 21:32:00 +01:00
mvdbeek fc62860b51 Drive tool shed tests with uvicorn 2022-03-15 21:32:00 +01:00
mvdbeek 02f94a93b4 Drop tests for WEB_APP=dev 2022-03-15 21:31:59 +01:00
mvdbeek 4aba9b8226 Make sure SERVER_PORT is string before passing on to hgwebdir 2022-03-15 21:31:59 +01:00
mvdbeek b39e8ad9a2 First pass in dropping uwsgi specific things 2022-03-15 21:31:59 +01:00
mvdbeek 7c5068863f WIP remove paster/uwsgi 2022-03-15 21:31:59 +01:00
mvdbeek 4ca837d764 Merge branch 'release_22.01' into 'release_22.05' 2022-03-15 20:46:28 +01:00
mvdbeek 1cbab39518 Update version to 22.01.1.dev0 2022-03-15 20:46:27 +01:00
mvdbeek 9690680ec7 Update version to 22.01. v22.01 2022-03-15 20:46:24 +01:00
Björn Grüning 7e5fd63729 Merge pull request #13539 from dannon/bstour-update
Update to new @galaxyproject/bootstrap-tour to fix tour anchor selection
2022-03-15 20:21:59 +01:00
John Chilton 72f3a6f465 Merge branch 'release_22.01' into dev 2022-03-15 14:51:10 -04:00
Dannon 86f696cc0b Merge pull request #13546 from mvdbeek/fix_yaml_preview_firefox
[22.01] Fix yaml preview in firefox
2022-03-15 12:47:43 -04:00
Marius van den Beek bfd02136cf Merge pull request #13547 from mvdbeek/add_gravity_to_test_requirements
[22.01] Make gravity import conditional
2022-03-15 17:43:48 +01:00
John Chilton dac867ab8a Merge pull request #13544 from mvdbeek/release_notes_update
[22.01] Update Release notes
2022-03-15 12:32:50 -04:00
mvdbeek 6806a0f995 Make gravity import conditional 2022-03-15 16:59:58 +01:00