merge main; enable test

TileDB-Inc · Oct 14, 2024 · 5c1ec43 · 5c1ec43
1 parent 7287748
commit 5c1ec43
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/apis/python/tests/test_tiledbvcf.py b/apis/python/tests/test_tiledbvcf.py
@@ -930,9 +930,7 @@ def test_sample_and_region_partitioned_read():
     assert len(df) == 0
 
 
-# TODO: enable after libtiledb 2.26.0 is released (https://github.com/TileDB-Inc/TileDB/pull/5223)
-# @pytest.mark.skipif(os.environ.get("CI") != "true", reason="CI only")
-@pytest.mark.skip
+@pytest.mark.skipif(os.environ.get("CI") != "true", reason="CI only")
 def test_large_export_correctness():
     uri = "s3://tiledb-inc-demo-data/tiledbvcf-arrays/v4/vcf-samples-20"
 

diff --git a/libtiledbvcf/CMakeLists.txt b/libtiledbvcf/CMakeLists.txt
@@ -96,7 +96,6 @@ if(WIN32 AND NOT MSYS)
   endif()
   # /wd4996 - no deprecated
   add_compile_options(/wd4996)
-  add_compile_options(/utf-8)
 else()
   if (BUILD_TYPE STREQUAL "DEBUG")
     add_compile_options(-DDEBUG -O0 -g3 -ggdb3 -gdwarf-3 -Wall)

diff --git a/libtiledbvcf/src/vcf/vcf_merger.cc b/libtiledbvcf/src/vcf/vcf_merger.cc
@@ -595,23 +595,8 @@ void VCFMerger::finish_merge() {
   rec->pos = md_.pos;
 
   // ID
-#ifdef _WIN32
-  // Workaround for windows python feedstock build, since fmt::join is not
-  // available
-  std::string ids{"."};
-  if (!md_.ids.empty()) {
-    std::ostringstream oss;
-    std::copy(
-        md_.ids.begin(),
-        md_.ids.end() - 1,
-        std::ostream_iterator<std::string>(oss, ";"));
-    oss << md_.ids.back();
-    ids = oss.str();
-  }
-#else
   std::string ids =
       md_.ids.size() ? fmt::format("{}", fmt::join(md_.ids, ";")) : ".";
-#endif
   bcf_update_id(hdr_.get(), rec.get(), ids.c_str());
 
   // REF, ALT