diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e7a164..2d68fad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,8 +35,8 @@ FetchContent_Declare( FetchContent_Declare( hictk URL - "${CMAKE_CURRENT_SOURCE_DIR}/external/hictk-312d83ec.tar.xz" - URL_HASH "SHA256=a47b1088de6650179715db17337e09c44729f8e86b4457848e306f028d0b5878" + "${CMAKE_CURRENT_SOURCE_DIR}/external/hictk-v2.0.1.tar.xz" + URL_HASH "SHA256=9282f7f4e978c71970f07627b360c3a4cf2bce4670ce3bd12e040c51c691ec3c" EXCLUDE_FROM_ALL OVERRIDE_FIND_PACKAGE SYSTEM diff --git a/external/hictk-312d83ec.tar.xz b/external/hictk-312d83ec.tar.xz deleted file mode 100644 index 32c05fd..0000000 Binary files a/external/hictk-312d83ec.tar.xz and /dev/null differ diff --git a/external/hictk-v2.0.1.tar.xz b/external/hictk-v2.0.1.tar.xz new file mode 100644 index 0000000..c0459c9 Binary files /dev/null and b/external/hictk-v2.0.1.tar.xz differ diff --git a/src/include/hictkpy/bin_table.hpp b/src/include/hictkpy/bin_table.hpp index fc38e61..59c0ff4 100644 --- a/src/include/hictkpy/bin_table.hpp +++ b/src/include/hictkpy/bin_table.hpp @@ -68,12 +68,6 @@ class BinTable { [[nodiscard]] std::vector chrom_names(bool include_ALL = false) const; }; -// TODO remove after merging https://github.com/paulsengroup/hictk/pull/298 -template -inline hictkpy::BinTable get_bins_from_sc_file(const T& obj) { - return hictkpy::BinTable(obj.bins()); -} - template inline hictkpy::BinTable get_bins_from_object(const T& obj) { return hictkpy::BinTable(obj.bins_ptr()); diff --git a/src/singlecell_file.cpp b/src/singlecell_file.cpp index f3c9739..1c20f6c 100644 --- a/src/singlecell_file.cpp +++ b/src/singlecell_file.cpp @@ -114,7 +114,7 @@ void declare_singlecell_file_class(nb::module_& m) { scell_file.def("chromosomes", &get_chromosomes_from_object, nb::arg("include_ALL") = false, "Get chromosomes sizes as a dictionary mapping names to sizes."); - scell_file.def("bins", &get_bins_from_sc_file, + scell_file.def("bins", &get_bins_from_object, nb::sig("def bins(self) -> hictkpy.BinTable"), "Get table of bins."); scell_file.def("attributes", &singlecell_file::get_attrs, "Get file attributes as a dictionary."); scell_file.def("cells", &singlecell_file::get_cells, "Get the list of available cells.");