diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9a1d0e24..4a8413c0 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: -- '11.0' +- '13.3' c_compiler: - clang c_compiler_version: diff --git a/.github/scripts/nightly/cpp20.patch b/.github/scripts/nightly/cpp20.patch deleted file mode 100644 index 769c5efc..00000000 --- a/.github/scripts/nightly/cpp20.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/recipe/build-libtiledbsoma.sh b/recipe/build-libtiledbsoma.sh -index 12d4f4f..5d50926 100644 ---- a/recipe/build-libtiledbsoma.sh -+++ b/recipe/build-libtiledbsoma.sh -@@ -2,6 +2,9 @@ - - set -exo pipefail - -+# Clear default compiler flags -+export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} -+ - mkdir libtiledbsoma-build && cd libtiledbsoma-build - - cmake \ -diff --git a/recipe/build-r-tiledbsoma.sh b/recipe/build-r-tiledbsoma.sh -index ffb435e..5a02821 100644 ---- a/recipe/build-r-tiledbsoma.sh -+++ b/recipe/build-r-tiledbsoma.sh -@@ -4,21 +4,28 @@ set -ex - - cd apis/r - -+# Clear default compiler flags -+export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} -+ - export DISABLE_AUTOBREW=1 - - # https://github.com/conda-forge/r-tiledb-feedstock/commit/29cb6816636e7b5b58545e1407a8f0c29ff9dc39 --if [[ $target_platform == osx-64 ]]; then -+if [[ $target_platform == osx-* ]]; then - export NN_CXX_ORIG=$CXX - export NN_CC_ORIG=$CC - export CXX=$RECIPE_DIR/cxx_wrap.sh - export CC=$RECIPE_DIR/cc_wrap.sh -- mkdir -p ~/.R -- echo CC=$RECIPE_DIR/cc_wrap.sh > ~/.R/Makevars -- echo CXX=$RECIPE_DIR/cxx_wrap.sh >> ~/.R/Makevars -- echo CXX17=$RECIPE_DIR/cxx_wrap.sh >> ~/.R/Makevars - fi - --export CXX17FLAGS="-Wno-deprecated-declarations -Wno-deprecated" -+export CXX="$CXX -std=c++20 -fPIC" -+export CXX20="$CXX" -+ -+mkdir -p ~/.R -+echo CC="$CC" > ~/.R/Makevars -+echo CXX="$CXX" >> ~/.R/Makevars -+echo CXX20="$CXX20" >> ~/.R/Makevars -+ -+export CXX20FLAGS="-Wno-deprecated-declarations -Wno-deprecated" - - # https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk - if [[ $target_platform == osx-* ]]; then -diff --git a/recipe/build-tiledbsoma-py.sh b/recipe/build-tiledbsoma-py.sh -index a55c068..1cb92ce 100644 ---- a/recipe/build-tiledbsoma-py.sh -+++ b/recipe/build-tiledbsoma-py.sh -@@ -4,6 +4,9 @@ set -ex - - cd apis/python - -+# Clear default compiler flags -+export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} -+ - echo - echo "PKG_VERSION IS <<$PKG_VERSION>>" - echo -diff --git a/recipe/cc_wrap.sh b/recipe/cc_wrap.sh -index a2bfc0c..1589e33 100755 ---- a/recipe/cc_wrap.sh -+++ b/recipe/cc_wrap.sh -@@ -1,4 +1,3 @@ - #!/bin/sh - --args="${@##-mmacosx-version-min=10.9*}" --$NN_CC_ORIG $args -mmacosx-version-min=11.0 -+$NN_CC_ORIG "$@" -mmacosx-version-min=13.3 -diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml -index 0c0129b..c4a9d77 100644 ---- a/recipe/conda_build_config.yaml -+++ b/recipe/conda_build_config.yaml -@@ -1,7 +1,7 @@ - # https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks - # https://conda-forge.org/news/2024/03/24/stdlib-migration/ - MACOSX_SDK_VERSION: # [osx and x86_64] -- - 11.0 # [osx and x86_64] -+ - 13.3 # [osx and x86_64] - c_stdlib_version: # [osx and x86_64] - - 11.0 # [osx and x86_64] - channel_sources: -diff --git a/recipe/cxx_wrap.sh b/recipe/cxx_wrap.sh -index 5d9def4..c8428cb 100755 ---- a/recipe/cxx_wrap.sh -+++ b/recipe/cxx_wrap.sh -@@ -1,4 +1,3 @@ - #!/bin/sh - --args="${@##-mmacosx-version-min=10.9*}" --$NN_CXX_ORIG $args -mmacosx-version-min=11.0 -+$NN_CXX_ORIG "$@" -mmacosx-version-min=13.3 diff --git a/.github/scripts/nightly/update-feedstock.sh b/.github/scripts/nightly/update-feedstock.sh index 911ec579..944e8739 100644 --- a/.github/scripts/nightly/update-feedstock.sh +++ b/.github/scripts/nightly/update-feedstock.sh @@ -16,9 +16,5 @@ sed -i \ s/"tiledb rc"/"tiledb nightlies"/ \ recipe/conda_build_config.yaml -# Apply patch from Xanthos to support C++20 -# https://github.com/TileDB-Inc/tiledbsoma-feedstock/pull/246 -patch -p1 < .github/scripts/nightly/cpp20.patch - # Print differences git --no-pager diff conda-forge.yml recipe/conda_build_config.yaml diff --git a/.gitignore b/.gitignore index 179afe55..bb385366 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/recipe/build-libtiledbsoma.sh b/recipe/build-libtiledbsoma.sh index 12d4f4fc..5d50926d 100644 --- a/recipe/build-libtiledbsoma.sh +++ b/recipe/build-libtiledbsoma.sh @@ -2,6 +2,9 @@ set -exo pipefail +# Clear default compiler flags +export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} + mkdir libtiledbsoma-build && cd libtiledbsoma-build cmake \ diff --git a/recipe/build-r-tiledbsoma.sh b/recipe/build-r-tiledbsoma.sh index ffb435e8..5a02821a 100644 --- a/recipe/build-r-tiledbsoma.sh +++ b/recipe/build-r-tiledbsoma.sh @@ -4,21 +4,28 @@ set -ex cd apis/r +# Clear default compiler flags +export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} + export DISABLE_AUTOBREW=1 # https://github.com/conda-forge/r-tiledb-feedstock/commit/29cb6816636e7b5b58545e1407a8f0c29ff9dc39 -if [[ $target_platform == osx-64 ]]; then +if [[ $target_platform == osx-* ]]; then export NN_CXX_ORIG=$CXX export NN_CC_ORIG=$CC export CXX=$RECIPE_DIR/cxx_wrap.sh export CC=$RECIPE_DIR/cc_wrap.sh - mkdir -p ~/.R - echo CC=$RECIPE_DIR/cc_wrap.sh > ~/.R/Makevars - echo CXX=$RECIPE_DIR/cxx_wrap.sh >> ~/.R/Makevars - echo CXX17=$RECIPE_DIR/cxx_wrap.sh >> ~/.R/Makevars fi -export CXX17FLAGS="-Wno-deprecated-declarations -Wno-deprecated" +export CXX="$CXX -std=c++20 -fPIC" +export CXX20="$CXX" + +mkdir -p ~/.R +echo CC="$CC" > ~/.R/Makevars +echo CXX="$CXX" >> ~/.R/Makevars +echo CXX20="$CXX20" >> ~/.R/Makevars + +export CXX20FLAGS="-Wno-deprecated-declarations -Wno-deprecated" # https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk if [[ $target_platform == osx-* ]]; then diff --git a/recipe/build-tiledbsoma-py.sh b/recipe/build-tiledbsoma-py.sh index a55c0684..1cb92ce8 100644 --- a/recipe/build-tiledbsoma-py.sh +++ b/recipe/build-tiledbsoma-py.sh @@ -4,6 +4,9 @@ set -ex cd apis/python +# Clear default compiler flags +export CXXFLAGS=${CXXFLAGS//"-fvisibility-inlines-hidden"/} + echo echo "PKG_VERSION IS <<$PKG_VERSION>>" echo diff --git a/recipe/cc_wrap.sh b/recipe/cc_wrap.sh index a2bfc0c9..1589e33d 100755 --- a/recipe/cc_wrap.sh +++ b/recipe/cc_wrap.sh @@ -1,4 +1,3 @@ #!/bin/sh -args="${@##-mmacosx-version-min=10.9*}" -$NN_CC_ORIG $args -mmacosx-version-min=11.0 +$NN_CC_ORIG "$@" -mmacosx-version-min=13.3 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1e171f62..7d8464dd 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ # https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks # https://conda-forge.org/news/2024/03/24/stdlib-migration/ MACOSX_SDK_VERSION: # [osx and x86_64] - - 11.0 # [osx and x86_64] + - 13.3 # [osx and x86_64] c_stdlib_version: # [osx and x86_64] - 11.0 # [osx and x86_64] channel_sources: diff --git a/recipe/cxx_wrap.sh b/recipe/cxx_wrap.sh index 5d9def44..c8428cb4 100755 --- a/recipe/cxx_wrap.sh +++ b/recipe/cxx_wrap.sh @@ -1,4 +1,3 @@ #!/bin/sh -args="${@##-mmacosx-version-min=10.9*}" -$NN_CXX_ORIG $args -mmacosx-version-min=11.0 +$NN_CXX_ORIG "$@" -mmacosx-version-min=13.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe378474..38361968 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "tiledbsoma" %} -{% set version = "1.15.7" %} -{% set sha256 = "ecdcafc2cb83e392e1102fea11e910548bcacdb854b5bc365c96ef940fed0c3f" %} +{% set version = "1.16.0" %} +{% set sha256 = "tbd" %} # This is the SHA256 of # TileDB-SOMA-i.j.k.tar.gz # from @@ -16,17 +16,16 @@ package: version: {{ version }} # Post-tag real thing: -source: - url: https://github.com/single-cell-data/TileDB-SOMA/archive/{{ version }}.tar.gz - sha256: {{ sha256 }} +# source: +# url: https://github.com/single-cell-data/TileDB-SOMA/archive/{{ version }}.tar.gz +# sha256: {{ sha256 }} # Pre-tag canary "will Conda be green if we release": -#source: -# git_url: https://github.com/single-cell-data/TileDB-SOMA.git -# # release-1.15 branch 2025-01-24 -# git_rev: ceb4a3682663dfc74a346c91cc5bfa85a0b0674c -# git_depth: -1 -# # hoping to be 1.15.5 <-- FILL IN HERE +source: + git_url: https://github.com/single-cell-data/TileDB-SOMA.git + git_rev: dad714f7e09dbebe9105cebb3f11ad8d646d6c4c + git_depth: -1 + # hoping to be 1.16.0 <-- FILL IN HERE build: number: 0