Commit Graph
59422 Commits
Author SHA1 Message Date
Nicola Soranzo e66bb0912d Drop last references to uWSGI 2022-03-22 14:31:08 +00:00
Dannon 49966b3b9a Merge pull request #13561 from guerler/fix_visualization_initialization
Properly initialize chart settings for new visualizations
2022-03-22 09:32:03 -04:00
Dannon 48579cf698 Merge pull request #13288 from dannon/menu-cleanup
[WIP] Menu cleanup
2022-03-22 08:15:15 -04:00
Assunta DeSanto 499ed041fd removing Search & Mailing List from ToolShed Menu 2022-03-22 00:33:35 -04:00
Assunta DeSanto db3542dd0b adding locale translations back 2022-03-22 00:32:02 -04:00
John Chilton 299bb3b32c Merge pull request #13585 from mvdbeek/drop_more_uwsgi
Drop remaining references to uWSGI
2022-03-21 14:55:08 -04:00
Assunta DeSanto 30773a478e removing wiki line from toolshed menu 2022-03-21 11:15:15 -04:00
Assunta DeSanto b2278f842f reverting how to cite link to link on HUB 2022-03-21 09:15:41 -04:00
Assunta DeSanto ff8a036fc4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into menu-cleanup 2022-03-21 09:12:41 -04:00
mvdbeek a9420d24b5 Drop remaining references to uWSGI 2022-03-21 13:44:37 +01:00
Björn Grüning 492e560b65 Merge pull request #13519 from jmchilton/no_implicit_optional
Disable implicit optional types.
2022-03-21 15:11:24 +03:00
Marius van den Beek cbc4bc9f06 Merge pull request #13579 from mvdbeek/legacy_openapi
Add legacy routes to openapi schema
2022-03-21 12:12:31 +01:00
John Chilton 4e01cfe3eb Merge pull request #13562 from ic4f/dev_sa20_3
Misc. SQLAlchemy 2.0 upgrades
2022-03-20 18:37:17 -04:00
mvdbeek ef0b04c345 Add more tags 2022-03-20 14:26:28 +01:00
mvdbeek d8271307d8 Restore tags in customized openapi schema 2022-03-20 14:26:28 +01:00
mvdbeek 102a7eab63 Add apispec dependency 2022-03-20 14:26:28 +01:00
mvdbeek e5eed5cbe0 Include non-FastAPI routes in api/docs 2022-03-19 16:56:46 +01:00
James Taylor 9a34fba455 API Schema Generation.
Traverse all registered API routes, attempt to load schema information
if available in docstring, register with an `APISpec` instance, and
convert to YAML.
2022-03-19 15:08:56 +01:00
Björn Grüning 479194ba9d Merge pull request #13577 from nsoranzo/fix_test_callback_nonce_validation_with_bad_nonce_unit_test
Fix `test_callback_nonce_validation_with_bad_nonce` unit test
2022-03-19 09:32:18 +01:00
Nicola Soranzo 6524e1f344 Fix path of venv when caching 2022-03-19 03:52:23 +00:00
Nicola Soranzo ca523f56b0 Cache galaxy root/.venv instead of .tox
Unit tests are not using tox any more since commit
c90e012fda .

Reports startup also install packages in the venv and not in `.tox` .
2022-03-19 03:38:12 +00:00
Nicola Soranzo cc5224bcf9 Use unique group id for unit-postgres tests
Otherwise unit tests get cancelled when unit-postgres job finishes.
2022-03-19 03:05:55 +00:00
Nicola Soranzo 6189032838 Fix test_callback_nonce_validation_with_bad_nonce unit test
Broken in PR #13572.
2022-03-19 02:20:05 +00:00
Nicola Soranzo 00f7522e7e Merge branch 'release_22.01' into dev 2022-03-19 01:57:33 +00:00
Marius van den Beek 38509cac8e Merge pull request #13576 from nsoranzo/release_22.01_fix_broken_model_discovery_tests
[22.01] Fix model discovery unit tests
2022-03-18 22:55:39 +01:00
Nicola Soranzo 0075ecb275 Fix model discovery unit tests
that I broke when merging
https://github.com/galaxyproject/galaxy/pull/13552 forward.

Fix:

```
app = <galaxy.model.unittest_utils.data_app.GalaxyDataTestApp object at 0x7f0e00dd3640>, target = '/tmp/tmpyj5d8268', work_directory = '/tmp/tmp_a7e191v'

    def _import_directory_to_history(app, target, work_directory):
        sa_session = app.model.context

        u = model.User(email="collection@example.com", password="password")
        import_history = model.History(name="Test History for Import", user=u)

        sa_session = app.model.context
        sa_session.add_all([u, import_history])
        sa_session.flush()

        assert len(import_history.datasets) == 0

        import_options = store.ImportOptions(allow_dataset_object_edit=True)
>       import_model_store = store.get_import_model_store_for_directory(target, app=app, user=u, import_options=import_options, tag_handler=app.tag_handler.create_tag_handler_session())
E       AttributeError: 'GalaxyDataTestApp' object has no attribute 'tag_handler'

test/unit/data/model/test_model_discovery.py:235: AttributeError
```
2022-03-18 19:12:20 +00:00
Nicola Soranzo 5114b67902 Merge branch 'release_21.09' into release_22.01 2022-03-18 18:28:15 +00:00
Nicola Soranzo 8e4bdb58e4 Merge branch 'release_21.05' into release_21.09 2022-03-18 18:08:10 +00:00
Dannon 1946eaf9a9 Merge pull request #13572 from afgane/nonce-mismatch-hint
Add nonce mismatch hint to exception msg
2022-03-18 13:09:36 -04:00
Marius van den Beek 74a51d990a Merge pull request #13552 from mvdbeek/fix_tag_creation_metadata_strategy_extended
[21.09] Fix creating tags within sessionless context
2022-03-18 15:42:43 +01:00
Nicola Soranzo 13d0f92fc0 Merge pull request #13071 from mvdbeek/drop_wsgi_mode 2022-03-18 13:41:33 +00:00
John Chilton 316998dea1 Merge pull request #13573 from mvdbeek/fix_tool_shed_bootstrapping
[22.01] Fix tool shed bootstrapping
2022-03-18 09:11:53 -04:00
John Chilton 954c78f301 Disable implicit optional typing across the project. 2022-03-18 09:06:30 -04:00
mvdbeek 7aae40d1af Include unit test for sessionless export/import with tags
Seems like the only way you could previously include tags
was if you included them in the data fetch tool.
2022-03-18 12:16:17 +01:00
mvdbeek 558cad246e Return tag in get_tag_by_name function 2022-03-18 11:12:06 +01:00
mvdbeek 6454ef1aad Drop converting things for which we have no equivalent 2022-03-17 21:20:59 +01:00
mvdbeek dc75df3b0b Fall back to generic WebApplicationStack
if we're building a web app, but aren't using gunicorn. I don't think
this has a big impact currently, since you can only set base pools via
lib/galaxy/main.py. I think you could set up alternative logging based
on the web stack class though, and this seems cleaner.
2022-03-17 21:20:59 +01:00
mvdbeek 96879486e2 Drop unused application_stack argument 2022-03-17 21:20:59 +01:00
mvdbeek b688aaf545 Drop unused get_stack_facts 2022-03-17 21:20:59 +01:00
Nicola Soranzo fe88225a14 Fix typo 2022-03-17 19:01:44 +00:00
mvdbeek 4c7bfd1032 Fix tool shed bootstrapping script 2022-03-17 19:34:43 +01:00
mvdbeek e9d2d683d6 Add --capture-output when running gunicorn in daemon mode 2022-03-17 19:34:16 +01:00
mvdbeek 3d7dde0f9b Fix tool shed /api/authenticate/baseauth/
Fixes:
```
AttributeError: 'UniverseApplication' object has no attribute 'user_manager'
  File "galaxy/web/framework/decorators.py", line 312, in decorator
    rval = func(self, trans, *args, **kwargs)
  File "galaxy/webapps/galaxy/api/authenticate.py", line 63, in get_api_key
    user = self.app.user_manager.get_user_by_identity(identity)
```
2022-03-17 19:33:18 +01:00
Nicola Soranzo 7699d40add Merge pull request #13571 from simonbray/importable-wf 2022-03-17 18:24:56 +00:00
Sergey Golitsynskiy 09be05082f Wrap sql stmt in text() (tool_shed, exluding migrate/versions) 2022-03-17 12:41:47 -04:00
Sergey Golitsynskiy f59a1ace97 Wrap sql stms in text() (model/) 2022-03-17 12:41:47 -04:00
Enis Afgan fe0083fb2b Add nonce mismatch hint to exception msg 2022-03-17 12:23:23 -04:00
Simon Bray a362874f07 allow setting a workflow as (un)importable via the API 2022-03-17 17:20:21 +01:00
mvdbeek 92d4ffc77a 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-17 10:28:06 +01:00
Sergey Golitsynskiy c88354adc6 Remove duplicate names 2022-03-17 10:28:06 +01:00