Merge pull request galaxyproject#16039 from mvdbeek/fix_gcsfs_test_di…

…scovery [23.0] Fix gcsfs test discovery
nsoranzo · May 4, 2023 · 1811f6d · 1811f6d
2 parents 0aff863 + f488d9f
commit 1811f6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py
@@ -266,6 +266,9 @@ def check_fs_googledrivefs(self):
     def check_fs_gcsfs(self):
         return "googlecloudstorage" in self.file_sources
 
+    def check_google_cloud_storage(self):
+        return "googlecloudstorage" in self.file_sources
+
     def check_fs_onedatafs(self):
         return "onedata" in self.file_sources
 

diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -24,6 +24,8 @@ s3fs  # type: s3fs
 fs.anvilfs # type: anvil
 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-onedatafs # type: onedata
 fs-basespace # type: basespace