From e80e614d86b7f0bf48811f32323f270c23b6393d Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Dec 2023 14:17:10 -0500 Subject: [PATCH] tiledbsoma 1.6.0 pre-release check 2 --- .scripts/build_steps.sh | 6 ++--- .scripts/run_osx_build.sh | 6 ++--- recipe/meta.yaml | 49 +++++++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 064e539a..eba1dfdb 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 conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,7 +74,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 mambabuild "${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 46ab346d..9259eb93 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 conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda mambabuild ./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/recipe/meta.yaml b/recipe/meta.yaml index 1937f534..51cf4e73 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "tiledbsoma" %} -{% set version = "1.5.1" %} -{% set sha256 = "c3ab7b0ebeec8c9acf99a29a33c269f22db19e5dab6bcf508b2e615f206231e9" %} +{% set version = "1.6.0" %} +{% set sha256 = "tee-bee-dee" %} # This is the SHA256 of # TileDB-SOMA-i.j.k.tar.gz # from @@ -12,16 +12,16 @@ package: name: {{ name }} version: {{ version }} -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-release canary "will Conda be green if we release": -#source: -# git_url: https://github.com/single-cell-data/TileDB-SOMA.git -# git_rev: 41754de2d65960b12378947b8cfe108cd0e6baaa -# git_depth: -1 -# # hoping to be 1.5.1 <-- FILL IN HERE +source: + git_url: https://github.com/single-cell-data/TileDB-SOMA.git + git_rev: 2afcf75ad86c945c6d8a3a435b0c2584701c6061 + git_depth: -1 + # hoping to be 1.6.0 <-- FILL IN HERE build: @@ -41,11 +41,11 @@ outputs: - cmake - make # [not win] host: - - tiledb >=2.17.4,<2.18 + - tiledb >=2.18.2,<2.19 - spdlog - fmt run: - - tiledb >=2.17.4,<2.18 + - tiledb >=2.18.2,<2.19 - spdlog - fmt about: @@ -72,7 +72,10 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - pybind11 # [build_platform != target_platform] - - pyarrow # [build_platform != target_platform] + # https://github.com/single-cell-data/TileDB-SOMA/issues/1926 + - pyarrow <13.0 # [build_platform != target_platform and osx] + - pyarrow # [build_platform != target_platform and not osx] + - pyarrow-hotfix # [build_platform != target_platform] - numpy # [build_platform != target_platform] host: - python @@ -86,21 +89,27 @@ outputs: - setuptools_scm - wheel - numpy - - pyarrow + # https://github.com/single-cell-data/TileDB-SOMA/issues/1926 + - pyarrow <13.0 # [osx] + - pyarrow # [not osx] + - pyarrow-hotfix run: - {{ pin_compatible('numpy', lower_bound='1.16', upper_bound='1.24') }} - {{ pin_subpackage('libtiledbsoma', exact=True) }} - pandas - - pyarrow + # https://github.com/single-cell-data/TileDB-SOMA/issues/1926 + - pyarrow <13.0 # [osx] + - pyarrow # [not osx] + - pyarrow-hotfix - python - scipy - anndata <0.10 # [py>37] - anndata <0.9 # [py<=37] - - tiledb-py >=0.23.4,<0.24.0 + - tiledb-py >=0.24.0,<0.25.0 - typing-extensions >=4.1 - numba - attrs >=22.2 - - somacore >=1.0.4 + - somacore >=1.0.6 - scanpy 1.9.* test: imports: @@ -133,7 +142,7 @@ outputs: - r-matrix # [build_platform != target_platform] - r-bit64 # [build_platform != target_platform] - r-rcppint64 # [build_platform != target_platform] - - r-tiledb >=0.21.3,<0.22 # [build_platform != target_platform] + - r-tiledb >=0.22.0,<0.23 # [build_platform != target_platform] - r-arrow # [build_platform != target_platform] - r-fs # [build_platform != target_platform] - r-glue # [build_platform != target_platform] @@ -149,7 +158,7 @@ outputs: - r-matrix - r-bit64 - r-rcppint64 - - r-tiledb >=0.21.3,<0.22 + - r-tiledb >=0.22.0,<0.23 - r-arrow - r-fs - r-glue @@ -165,7 +174,7 @@ outputs: - r-r6 - r-matrix - r-bit64 - - r-tiledb >=0.21.3,<0.22 + - r-tiledb >=0.22.0,<0.23 - r-arrow - r-fs - r-glue