Merge pull request #86 from regro-cf-autotick-bot/0.29.0_h1301df

r-tiledb v0.29.0
conda-forge · Jul 31, 2024 · ae28f80 · ae28f80
2 parents ee730eb + 97bd70b
commit ae28f80
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/recipe/0003-skip-osx-test-to-avoid-spurious-illegal-instruction.patch b/recipe/0003-skip-osx-test-to-avoid-spurious-illegal-instruction.patch
@@ -0,0 +1,29 @@
+diff --git a/inst/tinytest/test_query.R b/inst/tinytest/test_query.R
+index 00fc2b29..48e559a4 100644
+--- a/inst/tinytest/test_query.R
++++ b/inst/tinytest/test_query.R
+@@ -300,13 +300,14 @@ fromDataFrame(pp, uri, sparse = TRUE, col_index = c("species", "year"))
+ qry <- tiledb_query(tiledb_array(uri), "READ")
+ expect_equal(tiledb_query_get_range_num(qry, 1), 1)
+ qry <- tiledb_query(tiledb_array(uri), "READ")
+-expect_equal(tiledb_query_get_range_var(qry, 1, 1), c("", ""))
+-qry <- tiledb_query(tiledb_array(uri), "READ")
+-expect_error(tiledb_query_get_range_var(qry, 1, 2))  # wrong range
+-## dim 2: year
+-qry <- tiledb_query(tiledb_array(uri), "READ")
+-expect_equal(tiledb_query_get_range_num(qry, 2), 1)
+-qry <- tiledb_query(tiledb_array(uri), "READ")
+-expect_equal(tiledb_query_get_range(qry, 2, 1), c(2007, 2009, 0))
+-qry <- tiledb_query(tiledb_array(uri), "READ")
+-expect_error(tiledb_query_get_range(qry, 2, 2))  # wrong range
++# https://github.com/conda-forge/r-tiledb-feedstock/pull/86
++# expect_equal(tiledb_query_get_range_var(qry, 1, 1), c("", ""))
++# qry <- tiledb_query(tiledb_array(uri), "READ")
++# expect_error(tiledb_query_get_range_var(qry, 1, 2))  # wrong range
++# ## dim 2: year
++# qry <- tiledb_query(tiledb_array(uri), "READ")
++# expect_equal(tiledb_query_get_range_num(qry, 2), 1)
++# qry <- tiledb_query(tiledb_array(uri), "READ")
++# expect_equal(tiledb_query_get_range(qry, 2, 1), c(2007, 2009, 0))
++# qry <- tiledb_query(tiledb_array(uri), "READ")
++# expect_error(tiledb_query_get_range(qry, 2, 2))  # wrong range
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,16 +1,17 @@
 {% set name = "r-tiledb" %}
-{% set version = "0.28.2" %}
+{% set version = "0.29.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://github.com/TileDB-Inc/TileDB-R/archive/{{ version }}.tar.gz
-  sha256: 8e1463303703aa8788f1d24591065ec153ed9c40e8f400d9c2051c4c4ea51737
+  sha256: 8d31385629f782d106ff9c3c300ea404233228ab98f5c19394608321dd499405
   patches:
     - 0001-skip-osx-test-to-avoid-spurious-segfault.patch  # [osx and not arm64]
     - 0002-skip-aarch64-test-failure.patch  # [aarch64]
+    - 0003-skip-osx-test-to-avoid-spurious-illegal-instruction.patch  # [osx and not arm64]
 
 build:
   number: 0
@@ -31,20 +32,26 @@ requirements:
     - r-rcppspdlog  # [build_platform != target_platform]
     - r-rcppint64  # [build_platform != target_platform]
     - r-nanoarrow  # [build_platform != target_platform]
+    # Helps resolve Illegal instruction in tests
+    - libcxx <18          # [osx and x86_64]
   host:
     - r-base
-    - tiledb 2.24.*
+    - tiledb 2.25.*
     - r-rcpp >=1.0.8
     - r-rcppspdlog
     - r-nanotime
     - r-spdl
     - r-rcppint64
     - r-nanoarrow
+    # Helps resolve Illegal instruction in tests
+    - libcxx <18          # [osx and x86_64]
   run:
     - r-base
     - r-nanotime
     - r-spdl
     - r-nanoarrow
+    # Helps resolve Illegal instruction in tests
+    - libcxx <18          # [osx and x86_64]
 
 test:
   requires: