Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release_23.0 into dev #16088

Merged
merged 104 commits into from
May 15, 2023

Conversation

nsoranzo
Copy link
Member

@nsoranzo nsoranzo commented May 14, 2023

Attempt 3, using #16078 as a starting point but merging the latest release_23.0 commits, see #16078 (comment) .

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

bernt-matthias and others added 30 commits March 30, 2023 17:31
n, min, max, ... accept bytes (eg 500k)

i.e. the type annotation and thereby linting was wrong
I suggest to remove it, since its tested in the xsd linter
anyway (otherwise we would check for str)
the functions always get a str (from the xml attributes)
This will retrieve the history from the server for now. I should be replaced by the corresponding pinia store in the next release.
This allows to prepare downloads in the Short Term Storage without directly serve the resulting file.
Now the download "preparation" step has been clearly separated from the download form the export record.
Hopefully this will make more obvious that the first step now only prepares the history to be downloaded and once the export record is ready you can download it from there.
…y_export_papercuts

[23.0] Fix history export papercuts
Independently of whether the source items are hidden or not
Searching by annotation ot tag requires to use the prefix `tag:` or `annotation:`.
The new version is faster even for lines containing multiple tabs and
optimizes the no or one tag cases.
It also fixes a subtle bug that would drop a line at chunk boundaries.
…y_items_selector

[23.0] Fix build collection not resetting selection
The rocrate.zip model_store_format is covered now under the `ModelStoreFormat.is_compressed` condition since it is a zip file.
[23.0] Backport Improve display chunk generation for BAMs
This allows defining inputs such as
```
     Drosophila_melanogaster.BDGP6.32.109_UCSC.gtf.gz:
       class: File
       location: https://zenodo.org/record/6457007/files/Drosophila_melanogaster.BDGP6.32.109_UCSC.gtf.gz
       filetype: gtf
       decompress: true
```

without needing to know what the server side default of auto_compress
is.
…ag_to_staging_code

[23.0] Allow setting auto_decompress property in staging interface
…ading_placeholder_text_pub_histories

[23.0] Clarify search behavior in placeholder text in Published Histories
to reduce reactive updates

Signed-off-by: Laila Los <[email protected]>
Signed-off-by: Laila Los <[email protected]>
davelopez and others added 9 commits May 10, 2023 09:35
…share_anon

[23.0] Anonymous User tool link bug fix
It'll always pull in the first dataset in the `other_values` dict, which
isn'r correct. Tool parameters at this point know how to deal with
collections, so this shouldn't be neceesary.
[23.0] Display DCE in job parameter component, allow rerunning with DCE input
[23.0] Fix BCO export by updating gxformat2
I can't get the `getHistoryById` computed from historiesStore mocked properly...

- Also simplifies handling of history load in HistoryExport component.
@nsoranzo
Copy link
Member Author

@ElectronicBlueberry I think that taking out d9e45ef from #16078 was too complicated, so I've redone the merge here solving conflicts in the same way as you in almost all places. Sorry for the duplication of work!

@davelopez I've included also your commit from #16078 , if you have ideas on how to solve the last client unit test failure, please feel free to push commits here!

@davelopez
Copy link
Contributor

Unfortunately, I'm out of ideas on how to mock the getHistoryById computed, nothing that I tried worked. I talked to Laila and she is going to take a look as she might know how to properly fix it.

Copy link
Contributor

@davelopez davelopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ElectronicBlueberry for figuring out the problem with the test and fixing it!

I think the macOS test stalled, but this seems ready for merge 👍

@davelopez davelopez merged commit 31d64e5 into galaxyproject:dev May 15, 2023
@nsoranzo nsoranzo deleted the merge_release_23.0_20230513 branch May 15, 2023 16:39
@nsoranzo nsoranzo changed the title Merge release 23.0 into dev Merge release_23.0 into dev May 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.