Merge pull request #16451 from bernt-matthias/pin-fs.dropboxfs

pin fs.dropboxfs to >=1
galaxyproject · Jul 26, 2023 · 43c1ea6 · 43c1ea6
2 parents 8190e41 + 1f22daf
commit 43c1ea6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/galaxy/config/sample/file_sources_conf.yml.sample b/lib/galaxy/config/sample/file_sources_conf.yml.sample
@@ -2,7 +2,7 @@
   id: dropbox1
   label: Dropbox files (configure access in user preferences)
   doc: Your Dropbox files - configure an access token via the user preferences
-  accessToken: ${user.preferences['dropbox|access_token']}
+  access_token: ${user.preferences['dropbox|access_token']}
 
 - type: webdav
   id: owncloud1

diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -17,7 +17,7 @@ total-perspective-vortex>=2.2.4,<3
 
 # For file sources plugins
 fs.webdavfs>=0.4.2  # type: webdav
-fs.dropboxfs  # type: dropbox
+fs.dropboxfs>=1.0  # type: dropbox
 fs.sshfs  # type: ssh
 fs.anvilfs # type: anvil
 fs.googledrivefs # type: googledrive

diff --git a/lib/galaxy/files/sources/dropbox.py b/lib/galaxy/files/sources/dropbox.py
@@ -1,11 +1,7 @@
 try:
     from fs.dropboxfs import DropboxFS
 except ImportError:
-    # fs.dropboxfs < 0.3
-    try:
-        from dropboxfs.dropboxfs import DropboxFS
-    except ImportError:
-        DropboxFS = None
+    DropboxFS = None
 
 from typing import (
     Optional,
@@ -27,6 +23,10 @@ class DropboxFilesSource(PyFilesystem2FilesSource):
     def _open_fs(self, user_context=None, opts: Optional[FilesSourceOptions] = None):
         props = self._serialization_props(user_context)
         extra_props: Union[FilesSourceProperties, dict] = opts.extra_props or {} if opts else {}
+        # accessToken has been renamed to access_token in fs.dropboxfs 1.0
+        if "accessToken" in props:
+            props["access_token"] = props.pop("accessToken")
+
         handle = DropboxFS(**{**props, **extra_props})
         return handle