From 196ddfa82333e01fc570667dc916d3d75808b5ea Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 26 Mar 2024 13:03:55 +0000 Subject: [PATCH 1/2] tiledbsoma 1.9.0 pre-check --- recipe/meta.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5c5536b..88b1abb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "tiledbsoma" %} -{% set version = "1.8.1" %} -{% set sha256 = "e584fa49bc90bf07264c228da39685301c91c5e1ddb6e099753ce9572ac9acf7" %} +{% set version = "1.9.0" %} +{% set sha256 = "tbd" %} # This is the SHA256 of # TileDB-SOMA-i.j.k.tar.gz # from @@ -16,16 +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 -# git_rev: 81a0f604860dafd147ced42d10134310332bb979 -# git_depth: -1 -# # hoping to be 1.8.1 <-- FILL IN HERE +source: + git_url: https://github.com/single-cell-data/TileDB-SOMA.git + git_rev: b613f3bb078db5d2fd647b3f1f254cd13e6035dd + git_depth: -1 + # hoping to be 1.9.0 <-- FILL IN HERE build: number: 0 @@ -44,7 +44,7 @@ outputs: - cmake - make # [not win] host: - - tiledb >=2.20.0,<2.21 + - tiledb >=2.21.0,<2.22 - spdlog - fmt #### TEMP - libgoogle-cloud 2.17.* @@ -109,7 +109,7 @@ outputs: - scipy - anndata # [py>37] - anndata <0.9 # [py<=37] - - tiledb-py >=0.26.0,<0.27.0 + - tiledb-py >=0.27.0,<0.28.0 - typing-extensions >=4.1 - numba >=0.58.1 # [py>37] - numba # [py<=37] @@ -150,7 +150,7 @@ outputs: - r-matrix # [build_platform != target_platform] - r-bit64 # [build_platform != target_platform] - r-rcppint64 # [build_platform != target_platform] - - r-tiledb >=0.24.0,<0.25 # [build_platform != target_platform] + - r-tiledb >=0.25.0,<0.26 # [build_platform != target_platform] - r-arrow # [build_platform != target_platform] - r-fs # [build_platform != target_platform] - r-glue # [build_platform != target_platform] @@ -168,7 +168,7 @@ outputs: - r-matrix - r-bit64 - r-rcppint64 - - r-tiledb >=0.24.0,<0.25 + - r-tiledb >=0.25.0,<0.26 - r-arrow - r-fs - r-glue @@ -184,7 +184,7 @@ outputs: - r-r6 - r-matrix - r-bit64 - - r-tiledb >=0.24.0,<0.25 + - r-tiledb >=0.25.0,<0.26 - r-arrow - r-fs - r-glue From 2c5447922ff39f50a2fea953c75a34c1df7687bc Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 26 Mar 2024 13:06:59 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.34.0, and conda-forge-pinning 2024.03.26.11.57.11 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .ci_support/linux_64_fmt10spdlog1.12.yaml | 6 ++++++ .ci_support/linux_64_fmt9spdlog1.11.yaml | 6 ++++++ .ci_support/osx_64_.yaml | 6 ++++++ .ci_support/osx_arm64_.yaml | 6 ++++++ .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 8 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cc2ad41..8ebd125 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -17,6 +17,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 008b3dc..05bcf0f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -15,6 +15,7 @@ jobs: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_fmt10spdlog1.12.yaml b/.ci_support/linux_64_fmt10spdlog1.12.yaml index a01c1d9..56938cb 100644 --- a/.ci_support/linux_64_fmt10spdlog1.12.yaml +++ b/.ci_support/linux_64_fmt10spdlog1.12.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -43,6 +47,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - channel_sources - fmt - spdlog diff --git a/.ci_support/linux_64_fmt9spdlog1.11.yaml b/.ci_support/linux_64_fmt9spdlog1.11.yaml index 3351eaf..5fd75be 100644 --- a/.ci_support/linux_64_fmt9spdlog1.11.yaml +++ b/.ci_support/linux_64_fmt9spdlog1.11.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -43,6 +47,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - channel_sources - fmt - spdlog diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d399ee1..8b20792 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge,tiledb channel_targets: @@ -45,5 +49,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - MACOSX_DEPLOYMENT_TARGET - - python - numpy diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b5d8c8a..da840f3 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge,tiledb channel_targets: @@ -43,5 +47,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - MACOSX_DEPLOYMENT_TARGET - - python - numpy diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9121002..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${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 16daa69..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./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"