Unverified Commit d8d6eb48 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18372 from bwalkowi/test-onedata-objectstore-with-new-caching 

[24.1] Onedada object store and files source stability fixes
parents 5c681088 396c3e44

lib/galaxy/config/sample/object_store_conf.sample.yml

+2 −2
Original line number Diff line number Diff line
@@ -223,9 +223,9 @@ auth: 
  # an access token suitable for data access (allowing calls to the Oneprovider REST API).

  access_token: ...

connection:

  # the domain of the Onezone service (e.g. "demo.onedata.org"), or its IP address for

  # the domain of the Onezone service (e.g. datahub.egi.eu), or its IP address for

  # devel instances (see above).

  onezone_domain: demo.onedata.org

  onezone_domain: datahub.egi.eu

  # Allows connection to Onedata servers that do not present trusted SSL certificates. 

  # SHOULD NOT be used unless you really know what you are doing.

  disable_tls_certificate_validation: false

lib/galaxy/config/sample/object_store_conf.xml.sample

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
        an access token suitable for data access (allowing calls to the Oneprovider REST API).



    //connection/@onezone_domain -

        the domain of the Onezone service (e.g. "demo.onedata.org"), or its IP address for

        the domain of the Onezone service (e.g. datahub.egi.eu), or its IP address for

        devel instances (see above).



    //connection/@disable_tls_certificate_validation -
@@ -182,7 +182,7 @@ 
<!--

<object_store type="onedata">

    <auth access_token="..." />

    <connection onezone_domain="demo.onedata.org" disable_tls_certificate_validation="False"/>

    <connection onezone_domain="datahub.egi.eu" disable_tls_certificate_validation="False"/>

    <space name="demo-space" path="galaxy-data" />

    <cache path="database/object_store_cache" size="1000" cache_updated_data="True" />

    <extra_dir type="job_work" path="database/job_working_directory_onedata"/>

lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ preferences: 
        description: Your Onedata account

        inputs:

            - name: onezone_domain

              label: Domain of the Onezone service (e.g. "demo.onedata.org")

              label: Domain of the Onezone service (e.g. datahub.egi.eu)

              type: text

              required: False

            - name: access_token

lib/galaxy/dependencies/conditional-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ fs.googledrivefs # type: googledrive 
fs-gcsfs # type: googlecloudstorage

# fs-gcsfs doesn't pin google-cloud-storage, and old versions log noisy exceptions and break test discovery

google-cloud-storage>=2.8.0  # type: googlecloudstorage

fs.onedatarestfs # type: onedata, depends on onedatafilerestclient

fs.onedatarestfs==21.2.5.1 # type: onedata, depends on onedatafilerestclient

fs-basespace # type: basespace

fs-azureblob # type: azure

lib/galaxy/dependencies/dev-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ myst-parser==3.0.1 ; python_version >= "3.8" and python_version < "3.13" 
nh3==0.2.17 ; python_version >= "3.8" and python_version < "3.13"

numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9"

numpy==1.26.4 ; python_version >= "3.9" and python_version < "3.13"

onedatafilerestclient==21.2.5rc1 ; python_version >= "3.8" and python_version < "3.13"

onedatafilerestclient==21.2.5.1 ; python_version >= "3.8" and python_version < "3.13"

outcome==1.3.0.post0 ; python_version >= "3.8" and python_version < "3.13"

packaging==24.0 ; python_version >= "3.8" and python_version < "3.13"

pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.13"