opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-19 02:21:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
76,663 Commits 72 Branches 243 Tags
2c4ad24615743381f8dd59c15f1ff6bf89d07015
Commit Graph
76663 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius van den Beek 2c4ad24615 Merge pull request #18299 from guerler/load_pinia_manual_mount 
[24.1] Adds pinia to manually mounted vue components
 2024-06-03 15:11:52 +02:00
Marius van den Beek 60fbf432b5 Merge pull request #18301 from nsoranzo/release_24.1_fix_packages 
[24.1] Fix various packages' issues
 2024-06-03 15:11:28 +02:00
Marius van den Beek fa9af6ff29 Merge pull request #18303 from ElectronicBlueberry/fix-label-updated-popup 
[24.1] Fix "label updated" popup triggers too often
 2024-06-03 15:10:03 +02:00
Laila Los 51ae8d7215 keep lazy label updated actions queued longer 2024-06-03 11:07:07 +02:00
Nicola Soranzo 80701f4fc1 Add `pytest.ini` files to all packages 
Previously, when running pytest from `packages/test.sh`, it was using
our main `pytest.ini` as configfile, therefore setting the wrong
rootdir and using `lib` as `pythonpath`.
This was hiding various packaging issues fixed in the previous commits.
 2024-06-02 20:19:32 +01:00
Nicola Soranzo 1174bbe8f4 Fix packages' dependencies and MANIFEST.in files 
Also:
- Add missing `graphene` and `graphql-core` dependencies to
  `pyproject.toml` (already installed as other dependencies' deps,
  but explicitly imported by ToolShed code).
- Move `test_tool_validation.py` unit tests to the galaxy-tool-shed
  package.
 2024-06-02 19:56:20 +01:00
Nicola Soranzo b2076ee5f9 Move carbon data loading to `GalaxyManagerApplication` 
Fix the galaxy-config package wrongly depending on galaxy-app.
Also move the carbon_emissions unit tests to the `app/` subdirectory.

Refines @mvdbeek's proposed patch from https://github.com/galaxyproject/galaxy/pull/17159#issuecomment-1850276194 .

Close https://github.com/galaxyproject/galaxy/pull/17159 .
 2024-06-02 19:56:20 +01:00
Nicola Soranzo 0a7de5c79f Merge branch 'release_24.0' into release_24.1 2024-06-02 17:15:48 +01:00
Nicola Soranzo 132ea2b1bf Merge pull request #18296 from mvdbeek/untangle_shed_from_driver_util 
[24.0] Move tool shed specific driver function to tool_shed.test
 2024-06-01 18:26:39 +01:00
guerler 85951cd67e Add pinia to manually mounted vue components 2024-06-01 09:54:35 +03:00
mvdbeek 0d64837577 Fix global variable 2024-05-31 19:56:54 +02:00
mvdbeek e2f4043324 Pass init_fast_app in launch_server function 2024-05-31 19:53:11 +02:00
Marius van den Beek 10f9b3a4f6 Merge pull request #18283 from davelopez/24.0_fix_feature_location_index_data_provider 
[24.0] Check various preconditions in FeatureLocationIndexDataProvider
 2024-05-31 19:15:52 +02:00
Marius van den Beek 6901b1f359 Merge pull request #18286 from davelopez/24.0_fix_imported_history_link_for_anonymous 
[24.0] Redirect anonymous users to home when importing public histories
 2024-05-31 19:15:35 +02:00
Marius van den Beek 062371585a Merge pull request #18289 from davelopez/24.0_fix_copy_modal_login_link 
[24.0] Use correct link for log in or register in Copy Modal
 2024-05-31 19:06:42 +02:00
John Davis 60787f89e3 Add TS db revision tags for 24.1 2024-05-31 13:04:08 -04:00
John Davis 4772bbb026 Merge upstream/release_24.0 into release_24.1 2024-05-31 13:03:11 -04:00
mvdbeek a8ac6fd7ca Move tool shed specific driver function to tool_shed.test 
Should fix https://github.com/galaxyproject/galaxy/issues/18282
 2024-05-31 19:00:45 +02:00
Marius van den Beek 268aa814e2 Merge pull request #18294 from jdavcs/240_ts_db_revision_tags 
[24.0] Add TS db revision tags for 24.0
 2024-05-31 18:42:30 +02:00
John Davis 6c998adeac Add TS db revision tags for 24.0 2024-05-31 12:39:40 -04:00
John Davis 29cd573d93 Merge release_23.2 into release_24.0 2024-05-31 12:35:02 -04:00
Marius van den Beek 192fbde15f Merge pull request #18293 from jdavcs/232_ts_db_revision_tags 
[23.2] Add toolshed database revision tags for 23.2
 2024-05-31 18:33:32 +02:00
John Davis 579884db75 Add TS db revision tags for 23.2 2024-05-31 12:25:40 -04:00
John Davis 7a9148bf02 Merge release_23.1 into release_23.2 2024-05-31 12:19:52 -04:00
davelopez 234933b6a9 Use correct link for log in or register in Copy Modal 2024-05-31 15:58:05 +02:00
davelopez 3c95ac03e6 Redirect anonymous users to home when importing public histories 2024-05-31 15:27:28 +02:00
mvdbeek b2097db85d Merge remote-tracking branch 'upstream/release_24.0' into release_24.1 2024-05-31 15:27:27 +02:00
Marius van den Beek d5e44b654a Merge pull request #18284 from mvdbeek/fix_up_first_dataset_element_type_hint 
[24.0] Fix first_dataset_element type hint
 2024-05-31 15:25:23 +02:00
mvdbeek 99aeadec06 Fix first_dataset_element type hint 2024-05-31 15:09:31 +02:00
davelopez da202e09f1 Check various preconditions in FeatureLocationIndexDataProvider 
And raise appropriate error otherwise
 2024-05-31 15:03:59 +02:00
Marius van den Beek 8dd7a9e570 Merge pull request #18263 from mvdbeek/page_summary_fix 
[24.0] Set page importable to false when serializing
 2024-05-31 12:37:30 +02:00
Marius van den Beek 93a07857c2 Merge pull request #18278 from mvdbeek/collection_download 
Don't attempt to download purged datasets
 2024-05-31 12:37:06 +02:00
Nicola Soranzo 761a8d9f04 Merge pull request #18236 from mvdbeek/none_delete_error 
[24.0] Only log error if deleting directory really failed
 2024-05-31 10:42:54 +01:00
Marius van den Beek 48231391a8 Drop key argument 
Did not want to do that actually
 2024-05-31 10:18:23 +02:00
Marius van den Beek fd1cb2726a Merge pull request #18252 from bernt-matthias/revert/17656 
[24.1] Remove linter for unstripped text content for tool xml leaves
 2024-05-31 10:03:52 +02:00
Marius van den Beek aeaafc0cdc Merge pull request #18271 from jdavcs/231_ts_revision_tags 
[23.1] Add revision tags for TS migration in 23.1
 2024-05-31 10:02:29 +02:00
Marius van den Beek fb7d10b221 Merge pull request #18251 from davelopez/24.1_fix_history_export_error_handling 
[24.1] Fix history export error handling
 2024-05-31 10:01:55 +02:00
Marius van den Beek 942ddea389 Merge pull request #18255 from davelopez/24.0_fix_invenio_credentials_handling 
[24.0] Fix Invenio credentials handling
 2024-05-31 10:01:42 +02:00
John Chilton 4c8b4bf2a7 Merge pull request #18249 from mvdbeek/fix_no_elements_exception_extract_dataset 
[24.0] Raise exception when extracting dataset from collection without datasets
 2024-05-30 17:54:24 -04:00
John Chilton 1dd31f08f6 Merge pull request #18248 from mvdbeek/enable_transparent_use_of_compressed_datasets_in_DatasetDataProvider 
[24.0] Transparently open compressed files in DatasetDataProvider
 2024-05-30 17:53:20 -04:00
Martin Cech 8f4029cdda Merge pull request #18274 from jdavcs/241_result_mappings 
[24.1] Fix handler: access to result row items changed in SA2.0
 2024-05-30 23:07:35 +02:00
Martin Cech 0daf36d5d6 Merge pull request #18273 from nsoranzo/release_24.0_black 
[24.0] Format with black
 2024-05-30 23:03:56 +02:00
John Davis 534f933861 Fix SA20 bug 2024-05-30 15:19:38 -04:00
Nicola Soranzo 53bf8ce1de Format with black 2024-05-30 17:58:42 +01:00
Nicola Soranzo 3ea8de4ce5 Merge branch 'release_23.2' into release_24.0 2024-05-30 16:45:28 +01:00
Nicola Soranzo 94ebebf4ac Merge pull request #18268 from nsoranzo/release_23.2_fix_TestToolShedConfig 
[23.2] Add ``hgweb_repo_prefix`` attribute to ``TestToolShedConfig``
 2024-05-30 16:43:35 +01:00
John Davis 4dda05fbd3 Merge pull request #18270 from jdavcs/241_merge_24.0 
[24.1] Merge 24.0 into 24.1
 2024-05-30 11:40:45 -04:00
John Davis 05eecfc219 Add revision tags for TS migration in 23.1 2024-05-30 11:36:57 -04:00
John Davis 4030c70e9f Merge 24.0 into 24.1 
Adjust TS api_keys model
- Boolean datatype dropped since it's inferred from the type hint
- nullable=False added
 2024-05-30 11:24:24 -04:00
John Davis 15a8e6cc9a Merge branch 'release_23.2' into release_24.0 2024-05-30 11:11:12 -04:00