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 23.0 into dev #15902

Merged
merged 69 commits into from
Apr 6, 2023
Merged

Merge 23.0 into dev #15902

merged 69 commits into from
Apr 6, 2023

Commits on Dec 16, 2022

  1. Fix maintenance script bug

    jdavcs committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    dd553e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. Merge pull request galaxyproject#15222 from jdavcs/release_22.01_tabl…

    …e_attr_err
    
    [22.01] Fix maintenance script bug
    jmchilton committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    d62235f View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. xsd: add forgotten comment attribute

    for has_n_columns
    
    follow up on galaxyproject#12528
    bernt-matthias committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    92597e4 View commit details
    Browse the repository at this point in the history
  2. Doc text improvement

    Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
    bernt-matthias and nsoranzo committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    90b3559 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Configuration menu
    Copy the full SHA
    b7df527 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b0cbb8a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Configuration menu
    Copy the full SHA
    8b31087 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Configuration menu
    Copy the full SHA
    e2d0ef2 View commit details
    Browse the repository at this point in the history
  2. Test disconnecting output doesn't change map over

    for previously connected step that should still be mapped over.
    mvdbeek committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3fc4abf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    94123d5 View commit details
    Browse the repository at this point in the history
  4. Merge pull request galaxyproject#15826 from martenson/release_22.01

    [22.01] add security checks to page and visualization APIs
    martenson committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    5141a0f View commit details
    Browse the repository at this point in the history
  5. Rebuild terminal when step changes

    We should track this in a finer grained way maybe,
    but it'll work. This fixes displaying the right inferred
    collection source type when you change connections.
    mvdbeek committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    14eaee9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Configuration menu
    Copy the full SHA
    d7b173f View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Partially fix galaxyproject#15723

    This PR fixes tool recommendation galaxyproject#15723 partially, only in the workflow editor
    anuprulez authored and ElectronicBlueberry committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    3c6f93d View commit details
    Browse the repository at this point in the history
  2. run prettier

    ElectronicBlueberry committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    92cc29e View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. add thin wrapper to Recommendations

    allows toggling Recommendations using v-if
    ElectronicBlueberry committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    10ce335 View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#15791 from bernt-matthias/topic/has_…

    …n_columns_comment
    
    [22.01] xsd: add forgotten comment attribute
    dannon committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    6f6e375 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f959f05 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    caaa3e4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    82d5b4e View commit details
    Browse the repository at this point in the history
  6. Apply black to forward merge

    dannon committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    9b1301e View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Cast job_key to string

    mvdbeek authored and cat-bro committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    cc373c7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#15842 from ElectronicBlueberry/backp…

    …ort-patch-3
    
    [23.0] Fix tool recommendation in the workflow editor
    mvdbeek committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    d46f3ff View commit details
    Browse the repository at this point in the history
  3. Merge pull request galaxyproject#15850 from dannon/release_22.05

    Merge 22.01 -> 22.05
    dannon committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    5300b13 View commit details
    Browse the repository at this point in the history
  4. Update Gravity to 1.0.2

    natefoo committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    a37f902 View commit details
    Browse the repository at this point in the history
  5. Merge pull request galaxyproject#15862 from natefoo/gravity-1.0.2

    [23.0] Update Gravity to 1.0.2
    natefoo committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    de030cd View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Configuration menu
    Copy the full SHA
    b184e11 View commit details
    Browse the repository at this point in the history
  2. Changes to tests according to ro-crate

    metadata changes
    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e2882dc View commit details
    Browse the repository at this point in the history
  3. formatting

    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    9105ba3 View commit details
    Browse the repository at this point in the history
  4. Change which parameters are included.

    Remove duplicate dataset entries in Collections
    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    01782c0 View commit details
    Browse the repository at this point in the history
  5. mypy changes

    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    54186b1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    793b358 View commit details
    Browse the repository at this point in the history
  7. Removed unused import

    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    4118d27 View commit details
    Browse the repository at this point in the history
  8. fixed more formatting issues

    pauldg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    90cc518 View commit details
    Browse the repository at this point in the history
  9. return None if no user

    tchaussepied authored and mvdbeek committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    f4143b0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2180c38 View commit details
    Browse the repository at this point in the history
  11. Disable galaxy virtual env for aws batch job runner. This was causing…

    … some containers to attempt to use galaxy's python dependencies which are unavailable to batch, instead of container-installed dependencies as appropriate
    dannon committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    9422a3a View commit details
    Browse the repository at this point in the history
  12. Merge pull request galaxyproject#15823 from mvdbeek/fix_wrong_map_over

    [23.0] Find correct collection type if collection_type_source points at input of "any" collection type
    dannon committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    307c637 View commit details
    Browse the repository at this point in the history
  13. Merge pull request galaxyproject#15866 from mvdbeek/ananonymous_vault…

    …_fix
    
    [22.05] Backport galaxyproject#15858: Fix anonymous user uploads when vault is configured
    martenson committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    4c19636 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Configuration menu
    Copy the full SHA
    ab9377d View commit details
    Browse the repository at this point in the history
  2. Minimal fix for galaxyproject/tools-iuc#5163

    Tools may check for `is_of_type` if optional datasets to determine if
    the dataset has been provided.
    
    We should probably also drop the `tool` and `name` arguments that aren't
    consumed anywhere.
    mvdbeek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    66ed006 View commit details
    Browse the repository at this point in the history
  3. Merge pull request galaxyproject#15871 from mvdbeek/topic/is_of_type

    [23.0] Don't set datatype for optional datasets that were not provided
    mvdbeek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    aca7ffa View commit details
    Browse the repository at this point in the history
  4. Merge pull request galaxyproject#15869 from dannon/fix-aws-batch

    [23.0] AWS Batch python dependency bugfix
    mvdbeek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    57cd5ac View commit details
    Browse the repository at this point in the history
  5. Update 1 test/unit/data/model/test_model_store.py

    Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
    pauldg and davelopez committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    98c71d1 View commit details
    Browse the repository at this point in the history
  6. Update 2 test/unit/data/model/test_model_store.py

    Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
    pauldg and davelopez committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    2146f7d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e7b70f5 View commit details
    Browse the repository at this point in the history
  8. Merge pull request galaxyproject#15856 from cat-bro/cherry-pick-job-f…

    …iles-api-fix-for-22.05
    
    [22.05] Backport cast job_key to string galaxyproject#15578
    mvdbeek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    d0551dd View commit details
    Browse the repository at this point in the history
  9. Make dragImage transparent

    mvdbeek committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    d22dc4a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Remove IDs from error messages

    Simplifies encoding/decoding of IDs and prevents exposure issues
    davelopez committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    682da9f View commit details
    Browse the repository at this point in the history
  2. Merge pull request galaxyproject#15593 from mvdbeek/make_drag_icon_tr…

    …ansparent
    
    [23.0] Make dragImage transparent in workflow editor
    dannon committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    051c922 View commit details
    Browse the repository at this point in the history
  3. Merge pull request galaxyproject#15841 from pauldg/fix_rocrate_metadata

    [23.0] Fix Invocation RO-Crate metadata
    mvdbeek committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    7d9cbc7 View commit details
    Browse the repository at this point in the history
  4. List tags in /api/dataset_collections/{hdca_id}/contents/{parent_id}

    Fixes galaxyproject#15878.
    I don't love it, but the endpoint is paginated, and if we want
    to show tags in the summary view I think we have to do this.
    mvdbeek committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    7f425d1 View commit details
    Browse the repository at this point in the history
  5. Merge pull request galaxyproject#15883 from mvdbeek/tags_in_collectio…

    …n_view
    
    [23.0] List tags in ``/api/dataset_collections/{hdca_id}/contents/{parent_id}``
    martenson committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    905e89f View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Merge pull request galaxyproject#15882 from davelopez/22.05_fix_ids_o…

    …n_errors
    
    [22.05] Remove some IDs from error messages
    mvdbeek committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    42c9aff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b855a81 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bee3d2e View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. cached_explicit_singularity: copy container description

    otherwise `container_description.identifier = cache_path` (at the end of the function)
    will modify the original (i.e. the tools) container description which influences
    i.e. (may break) successive container resolutions.
    bernt-matthias committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    e81fc67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b715de View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d5bc7ff View commit details
    Browse the repository at this point in the history
  4. Merge pull request galaxyproject#15893 from bernt-matthias/fix/cached…

    …_explicit_singularity_container_description
    
    [22.01] cached_explicit_singularity: needs to copy container description
    mvdbeek committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    f76d894 View commit details
    Browse the repository at this point in the history
  5. Merge pull request galaxyproject#15891 from ElectronicBlueberry/webho…

    …ok-z-index
    
    [23.0] Fix tool bar on top of pop-ups
    dannon committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    2acf212 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a99c137 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0a04397 View commit details
    Browse the repository at this point in the history
  8. Merge pull request galaxyproject#15894 from davelopez/23.0_fix_export…

    …_archive_extension
    
    [23.0] Fix short term storage archive export extension on download
    jmchilton committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0698979 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Merge pull request galaxyproject#15896 from bernt-matthias/merge/22.0…

    …1_22.05
    
    [22.05] merge 22.01
    mvdbeek committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f420a61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7452b2e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c655360 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d31a347 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Fix types in terminal tests

    Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
    mvdbeek and ElectronicBlueberry committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    0804f0e View commit details
    Browse the repository at this point in the history