Skip to content

Commit

Permalink
Merge pull request #75 from regro-cf-autotick-bot/0.25.0_hd1dd40
Browse files Browse the repository at this point in the history
r-tiledb v0.25.0
  • Loading branch information
jdblischak authored Mar 21, 2024
2 parents daabcba + c1468c1 commit e31c2c6
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions recipe/0001-skip-osx-test-to-avoid-spurious-segfault.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/inst/tinytest/test_tiledbarray.R b/inst/tinytest/test_tiledbarray.R
index b9185e5..4311f95 100644
index e50d8720..99875684 100644
--- a/inst/tinytest/test_tiledbarray.R
+++ b/inst/tinytest/test_tiledbarray.R
@@ -1,6 +1,10 @@
library(tinytest)
library(tiledb)

+# Skip for conda osx-64 build (controlled by Jinja selectors in recipe) due to
+# spurious test failures
+exit_file("skip for conda osx-64 build")
+
isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion)
if (isOldWindows) exit_file("skip this file on old Windows releases")
isMacOS <- (Sys.info()['sysname'] == "Darwin")

ctx <- tiledb_ctx(limitTileDBCores())
9 changes: 6 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% set name = "r-tiledb" %}
{% set version = "0.24.0" %}
{% set version = "0.25.0" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://github.com/TileDB-Inc/TileDB-R/archive/{{ version }}.tar.gz
sha256: 5a2ce179a3c263065fd42e35b5ac49a3fd53bb4dd2479a47a8b50487502a5597
sha256: 84e2e6b4d08f86cfcb13810f4939c0b78bca2684af7bf800ad41b7979085d729
patches: # [osx and not arm64]
- 0001-skip-osx-test-to-avoid-spurious-segfault.patch # [osx and not arm64]

Expand All @@ -28,18 +28,21 @@ requirements:
- r-rcpp >=1.0.8 # [build_platform != target_platform]
- r-rcppspdlog # [build_platform != target_platform]
- r-rcppint64 # [build_platform != target_platform]
- r-nanoarrow # [build_platform != target_platform]
host:
- r-base
- tiledb 2.20.*
- tiledb 2.21.*
- r-rcpp >=1.0.8
- r-rcppspdlog
- r-nanotime
- r-spdl
- r-rcppint64
- r-nanoarrow
run:
- r-base
- r-nanotime
- r-spdl
- r-nanoarrow

test:
requires:
Expand Down

0 comments on commit e31c2c6

Please sign in to comment.