Rename to avoid conflict

single-cell-data · Oct 14, 2024 · 36f30f5 · 36f30f5
1 parent 3bb665e
commit 36f30f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/apis/python/setup.py b/apis/python/setup.py
@@ -303,7 +303,7 @@ def run(self):
                 "src/tiledbsoma/common.cc",
                 "src/tiledbsoma/reindexer.cc",
                 "src/tiledbsoma/query_condition.cc",
-                "src/tiledbsoma/vfs.cc",
+                "src/tiledbsoma/soma_vfs.cc",
                 "src/tiledbsoma/soma_context.cc",
                 "src/tiledbsoma/soma_array.cc",
                 "src/tiledbsoma/soma_object.cc",

diff --git a/apis/python/src/tiledbsoma/io/_util.py b/apis/python/src/tiledbsoma/io/_util.py
@@ -48,8 +48,8 @@ def read_h5ad(
     This lets us ingest H5AD with "r" (backed mode) from S3 URIs.
     """
     ctx = ctx or SOMATileDBContext()
-    vfs = clib.VFS(ctx.native_context)
-    input_handle = clib.VFSFilebuf(vfs).open(str(input_path))
+    vfs = clib.SOMAVFS(ctx.native_context)
+    input_handle = clib.SOMAVFSFilebuf(vfs).open(str(input_path))
     try:
         with _hack_patch_anndata():
             anndata = ad.read_h5ad(_FSPathWrapper(input_handle, input_path), mode)

diff --git a/apis/python/src/tiledbsoma/pytiledbsoma.cc b/apis/python/src/tiledbsoma/pytiledbsoma.cc
@@ -27,7 +27,7 @@ void load_soma_group(py::module&);
 void load_soma_collection(py::module&);
 void load_query_condition(py::module&);
 void load_reindexer(py::module&);
-void load_vfs(py::module&);
+void load_soma_vfs(py::module&);
 
 PYBIND11_MODULE(pytiledbsoma, m) {
     py::register_exception<TileDBSOMAError>(m, "SOMAError");
@@ -151,7 +151,7 @@ PYBIND11_MODULE(pytiledbsoma, m) {
     load_soma_collection(m);
     load_query_condition(m);
     load_reindexer(m);
-    load_vfs(m);
+    load_soma_vfs(m);
 }
 
 };  // namespace libtiledbsomacpp
diff --git a/apis/python/src/tiledbsoma/vfs.cc → apis/python/src/tiledbsoma/soma_vfs.cc b/apis/python/src/tiledbsoma/vfs.cc → apis/python/src/tiledbsoma/soma_vfs.cc
@@ -1,5 +1,5 @@
 /**
- * @file   vfs.cc
+ * @file   soma_vfs.cc
  *
  * @section LICENSE
  *
@@ -40,14 +40,14 @@ using namespace tiledbsoma;
 
 using VFSFilebuf = tiledb::impl::VFSFilebuf;
 
-void load_vfs(py::module& m) {
-    py::class_<tiledb::VFS>(m, "VFS").def(
+void load_soma_vfs(py::module& m) {
+    py::class_<tiledb::VFS>(m, "SOMAVFS").def(
         py::init([](std::shared_ptr<SOMAContext> context) {
             return tiledb::VFS(*context->tiledb_ctx());
         }),
         "ctx"_a);
 
-    py::class_<VFSFilebuf>(m, "VFSFilebuf")
+    py::class_<VFSFilebuf>(m, "SOMAVFSFilebuf")
         .def(py::init<const VFS&>())
         .def(
             "open",