From 0fd006c1c2f7d35a3562a104dde8fe9cfd18c910 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 28 Feb 2024 16:09:41 +0000 Subject: [PATCH 01/16] tiledbsoma 1.0.8 pre-check --- recipe/meta.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dcb9baea..376b61c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "tiledbsoma" %} -{% set version = "1.7.2" %} -{% set sha256 = "b0ccf8e0498531a36eef88e4896f02306b18491b34843054093f8c8c6f63796e" %} +{% set version = "1.8.0" %} +{% set sha256 = "tbd" %} # This is the SHA256 of # TileDB-SOMA-i.j.k.tar.gz # from @@ -13,16 +13,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 -# git_rev: b95a752a335b50a7e08b9dd729748e3c6ccd9b57 -# git_depth: -1 -# # hoping to be 1.7.2 <-- FILL IN HERE +source: + git_url: https://github.com/single-cell-data/TileDB-SOMA.git + git_rev: 2b93c63fa4f763d46cfcbbd80440cc116046585f + git_depth: -1 + # hoping to be 1.8.0 <-- FILL IN HERE build: @@ -42,7 +42,7 @@ outputs: - cmake - make # [not win] host: - - tiledb >=2.19.1,<2.20 + - tiledb >=2.20.0,<2.21 - spdlog - fmt about: @@ -102,12 +102,12 @@ outputs: - scipy - anndata <0.10 # [py>37] - anndata <0.9 # [py<=37] - - tiledb-py >=0.25.0,<0.26.0 + - tiledb-py >=0.26.0,<0.27.0 - typing-extensions >=4.1 - numba >=0.58.1 # [py>37] - numba # [py<=37] - attrs >=22.2 - - somacore >=1.0.7 + - somacore >=1.0.8 - scanpy 1.9.* test: imports: @@ -140,7 +140,7 @@ outputs: - r-matrix # [build_platform != target_platform] - r-bit64 # [build_platform != target_platform] - r-rcppint64 # [build_platform != target_platform] - - r-tiledb >=0.23.0,<0.24 # [build_platform != target_platform] + - r-tiledb >=0.24.0,<0.25 # [build_platform != target_platform] - r-arrow # [build_platform != target_platform] - r-fs # [build_platform != target_platform] - r-glue # [build_platform != target_platform] @@ -156,7 +156,7 @@ outputs: - r-matrix - r-bit64 - r-rcppint64 - - r-tiledb >=0.23.0,<0.24 + - r-tiledb >=0.24.0,<0.25 - r-arrow - r-fs - r-glue @@ -172,7 +172,7 @@ outputs: - r-r6 - r-matrix - r-bit64 - - r-tiledb >=0.23.0,<0.24 + - r-tiledb >=0.24.0,<0.25 - r-arrow - r-fs - r-glue From a7f6003c80b7a609210ccb30fb13cf09b23cf465 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 28 Feb 2024 22:16:46 +0000 Subject: [PATCH 02/16] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.31.1, and conda-forge-pinning 2024.02.28.18.36.29 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- build-locally.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e..9121002a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..16daa698 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 2812f82f89cbbd19a2778014d6541137227a5ffb Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 29 Feb 2024 17:16:00 -0500 Subject: [PATCH 03/16] Apply findings from #93 --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 376b61c5..8f3007dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,6 +45,7 @@ outputs: - tiledb >=2.20.0,<2.21 - spdlog - fmt + - libgoogle-cloud 2.12.* about: home: http://tiledb.com license: MIT @@ -90,6 +91,7 @@ outputs: - pyarrow <13.0 # [osx] - pyarrow # [not osx] - pyarrow-hotfix + - libgoogle-cloud 2.12.* run: - {{ pin_compatible('numpy', lower_bound='1.16', upper_bound='1.24') }} - {{ pin_subpackage('libtiledbsoma', exact=True) }} @@ -100,7 +102,7 @@ outputs: - pyarrow-hotfix - python - scipy - - anndata <0.10 # [py>37] + - anndata # [py>37] - anndata <0.9 # [py<=37] - tiledb-py >=0.26.0,<0.27.0 - typing-extensions >=4.1 @@ -108,7 +110,7 @@ outputs: - numba # [py<=37] - attrs >=22.2 - somacore >=1.0.8 - - scanpy 1.9.* + - scanpy >=1.9.2 test: imports: - tiledbsoma From 07c21bd8106a1e89c5b2ecc34657a882044fce21 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 29 Feb 2024 22:47:04 +0000 Subject: [PATCH 04/16] try libgoogle-cloud 2.17 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f3007dd..f948d071 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,7 +45,7 @@ outputs: - tiledb >=2.20.0,<2.21 - spdlog - fmt - - libgoogle-cloud 2.12.* + - libgoogle-cloud 2.17.* about: home: http://tiledb.com license: MIT @@ -91,7 +91,7 @@ outputs: - pyarrow <13.0 # [osx] - pyarrow # [not osx] - pyarrow-hotfix - - libgoogle-cloud 2.12.* + - libgoogle-cloud 2.17.* run: - {{ pin_compatible('numpy', lower_bound='1.16', upper_bound='1.24') }} - {{ pin_subpackage('libtiledbsoma', exact=True) }} From 6f2562d3bb708e386bc430c7ff7001533246db78 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 1 Mar 2024 16:47:55 -0500 Subject: [PATCH 05/16] try macosx 10.14 -> 10.15 like some other feedstocks do --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 0d0b7c36..630af8de 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,5 @@ MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.14 # [osx and x86_64] + - 10.15 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "10.14" # [osx and x86_64] channel_sources: From d299856e4b04ec40f34d2d79eb928a5d2f07625a Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 1 Mar 2024 17:03:06 -0500 Subject: [PATCH 06/16] iterating --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 13b2eb01..e548a31f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,7 +45,7 @@ outputs: - tiledb >=2.20.0,<2.21 - spdlog - fmt - - libgoogle-cloud 2.17.* + #### TEMP - libgoogle-cloud 2.17.* about: home: http://tiledb.com license: MIT @@ -91,7 +91,7 @@ outputs: - pyarrow <13.0 # [osx] - pyarrow # [not osx] - pyarrow-hotfix - - libgoogle-cloud 2.17.* + #### TEMP - libgoogle-cloud 2.17.* run: - {{ pin_compatible('numpy', lower_bound='1.16', upper_bound='1.24') }} - {{ pin_subpackage('libtiledbsoma', exact=True) }} From f4f7ff466d7f5c48b64756b29cc385ece8b976d7 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 1 Mar 2024 17:29:41 -0500 Subject: [PATCH 07/16] typofix --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 630af8de..c0151518 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ MACOSX_SDK_VERSION: # [osx and x86_64] - 10.15 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.14" # [osx and x86_64] + - "10.15" # [osx and x86_64] channel_sources: - conda-forge,tiledb channel_targets: From d416ebc97e31711753b21d280d547389f53ad7a4 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 1 Mar 2024 23:29:01 +0000 Subject: [PATCH 08/16] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.01.21.24.14 --- .ci_support/osx_64_.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 197765af..76303908 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '10.15' MACOSX_SDK_VERSION: -- '10.14' +- '10.15' c_compiler: - clang c_compiler_version: From e2ad58084f31840ed3f816d7a0e9a1968b66cc24 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Mon, 4 Mar 2024 11:26:34 -0500 Subject: [PATCH 09/16] Use conda-forge workaround for newer C++ features on macOS https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk --- recipe/build-libtiledbsoma.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/build-libtiledbsoma.sh b/recipe/build-libtiledbsoma.sh index 12d4f4fc..4f5d190c 100644 --- a/recipe/build-libtiledbsoma.sh +++ b/recipe/build-libtiledbsoma.sh @@ -2,6 +2,11 @@ set -exo pipefail +# https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk +if [[ $target_platform == osx-* ]]; then + CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" +fi + mkdir libtiledbsoma-build && cd libtiledbsoma-build cmake \ From cc23420b852068fd1d965945e18219b08f1cabd6 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Mon, 4 Mar 2024 11:56:48 -0500 Subject: [PATCH 10/16] The macOS SDK errors are from the r-tiledbsoma build with r-base 4.3 --- recipe/build-libtiledbsoma.sh | 5 ----- recipe/build-r-tiledbsoma.sh | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/build-libtiledbsoma.sh b/recipe/build-libtiledbsoma.sh index 4f5d190c..12d4f4fc 100644 --- a/recipe/build-libtiledbsoma.sh +++ b/recipe/build-libtiledbsoma.sh @@ -2,11 +2,6 @@ set -exo pipefail -# https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk -if [[ $target_platform == osx-* ]]; then - CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" -fi - mkdir libtiledbsoma-build && cd libtiledbsoma-build cmake \ diff --git a/recipe/build-r-tiledbsoma.sh b/recipe/build-r-tiledbsoma.sh index 98ca8672..ce2a5434 100644 --- a/recipe/build-r-tiledbsoma.sh +++ b/recipe/build-r-tiledbsoma.sh @@ -20,6 +20,11 @@ fi export CXX17FLAGS="-Wno-deprecated-declarations -Wno-deprecated" +# https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk +if [[ $target_platform == osx-* ]]; then + CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" +fi + # Unlike most R recipes which are built for one R version per job, this recipe # with multiple outputs builds for each of the R versions in the same job. Thus # the compiled files in the source directory need to be cleaned between builds, From 7bab53bdfd74849fef78e5f3c758b87d79e01f73 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Mon, 4 Mar 2024 15:25:17 -0500 Subject: [PATCH 11/16] try @jdblischak items from #95 --- .ci_support/osx_64_.yaml | 4 ++-- recipe/cc_wrap.sh | 2 +- recipe/conda_build_config.yaml | 5 +++-- recipe/cxx_wrap.sh | 2 +- recipe/meta.yaml | 9 ++++++++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 76303908..41d1ad60 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: -- '10.15' +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/recipe/cc_wrap.sh b/recipe/cc_wrap.sh index 6154d60c..a2bfc0c9 100755 --- a/recipe/cc_wrap.sh +++ b/recipe/cc_wrap.sh @@ -1,4 +1,4 @@ #!/bin/sh args="${@##-mmacosx-version-min=10.9*}" -$NN_CC_ORIG $args -mmacosx-version-min=10.14 +$NN_CC_ORIG $args -mmacosx-version-min=11.0 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index c0151518..b2c6a656 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,8 @@ +# https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.15 # [osx and x86_64] + - 11.0 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.15" # [osx and x86_64] + - "11.0" # [osx and x86_64] channel_sources: - conda-forge,tiledb channel_targets: diff --git a/recipe/cxx_wrap.sh b/recipe/cxx_wrap.sh index 94f57566..5d9def44 100755 --- a/recipe/cxx_wrap.sh +++ b/recipe/cxx_wrap.sh @@ -1,4 +1,4 @@ #!/bin/sh args="${@##-mmacosx-version-min=10.9*}" -$NN_CXX_ORIG $args -mmacosx-version-min=10.14 +$NN_CXX_ORIG $args -mmacosx-version-min=11.0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e548a31f..211fa141 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ source: build: - number: 2 + number: 0 skip: true # [win or linux32 or py2k] # Important: set this back to 0 on a new release @@ -46,6 +46,9 @@ outputs: - spdlog - fmt #### TEMP - libgoogle-cloud 2.17.* + run: + # https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] about: home: http://tiledb.com license: MIT @@ -111,6 +114,8 @@ outputs: - attrs >=22.2 - somacore >=1.0.8 - scanpy >=1.9.2 + # https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: imports: - tiledbsoma @@ -151,6 +156,8 @@ outputs: - r-dplyr # [build_platform != target_platform] - r-data.table # [build_platform != target_platform] - r-rlang # [build_platform != target_platform] + # https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] host: - {{ pin_subpackage('libtiledbsoma', exact=True) }} - r-base From fb14260629ef069698f2020783982218c7107476 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Mar 2024 11:48:58 -0500 Subject: [PATCH 12/16] update to today's tip of release-1.8 banch --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 211fa141..eab7b4e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ package: # Pre-tag canary "will Conda be green if we release": source: git_url: https://github.com/single-cell-data/TileDB-SOMA.git - git_rev: 2b93c63fa4f763d46cfcbbd80440cc116046585f + git_rev: 5bf75f5d5373933265c97bf1e430b01272099080 git_depth: -1 # hoping to be 1.8.0 <-- FILL IN HERE From 3223029c07dfb3a7103364629cf54db389002f92 Mon Sep 17 00:00:00 2001 From: Isaiah Norton Date: Wed, 6 Mar 2024 08:39:40 -0500 Subject: [PATCH 13/16] add cmake to build dep --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eab7b4e9..55530f39 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,6 +69,7 @@ outputs: build: requirements: build: + - cmake - {{ compiler('cxx') }} - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] From ac62e5989e9cfc2adbd94f07cded290433e27d75 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 6 Mar 2024 14:15:52 -0500 Subject: [PATCH 14/16] more advice from @jdblischak --- recipe/build-tiledbsoma-py.sh | 5 ++++- recipe/meta.yaml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/build-tiledbsoma-py.sh b/recipe/build-tiledbsoma-py.sh index 3d838fce..7ff7c065 100644 --- a/recipe/build-tiledbsoma-py.sh +++ b/recipe/build-tiledbsoma-py.sh @@ -5,6 +5,9 @@ set -ex cd apis/python echo "$PKG_VERSION" >> RELEASE-VERSION -$PYTHON setup.py install --single-version-externally-managed --record record.txt --libtiledbsoma="${PREFIX}" + +export TILEDB_PATH=$PREFIX +export TILEDBSOMA_PATH=$PREFIX +$PYTHON -m pip install --no-deps --no-build-isolation . -vv $PYTHON setup.py clean --all diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 55530f39..eab7b4e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,7 +69,6 @@ outputs: build: requirements: build: - - cmake - {{ compiler('cxx') }} - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] From 74ca0a34869c4700089f1a50c472d7587285170b Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 6 Mar 2024 14:17:31 -0500 Subject: [PATCH 15/16] update git hash to tip of release-1.8 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eab7b4e9..51d2b5f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ package: # Pre-tag canary "will Conda be green if we release": source: git_url: https://github.com/single-cell-data/TileDB-SOMA.git - git_rev: 5bf75f5d5373933265c97bf1e430b01272099080 + git_rev: 0ff7796fb129a7cef1b8cf5c5a507f33d46a43d5 git_depth: -1 # hoping to be 1.8.0 <-- FILL IN HERE From 33b438bd5ac5a47a482fa7132a31d0ac7be6a476 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 6 Mar 2024 16:04:50 -0500 Subject: [PATCH 16/16] more branch-tip --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 51d2b5f1..9dfb8de3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ package: # Pre-tag canary "will Conda be green if we release": source: git_url: https://github.com/single-cell-data/TileDB-SOMA.git - git_rev: 0ff7796fb129a7cef1b8cf5c5a507f33d46a43d5 + git_rev: b54ba225623ec2e9dab04bd2a1061298377d8677 git_depth: -1 # hoping to be 1.8.0 <-- FILL IN HERE