From 09790f6e0c13495f38c41dce802439b5b14fc9e9 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Tue, 21 May 2024 15:25:05 -0400 Subject: [PATCH 1/2] Drop py312 variant for osx-* builds --- recipe/conda_build_config.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index bd272d55..4088eb80 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -31,3 +31,22 @@ zip_keys: # [linux] # manual pin below spdlog: # [not linux] - 1.13 # [not linux] +# The below prevents a Python 3.12 variant for the osx-* builds. We can't build +# tiledbsoma-py for Python 3.12 on osx-* until the AWS/S3 problem introduced in +# pyarrow 13 is resolved +# https://github.com/single-cell-data/TileDB-SOMA/issues/1926#issuecomment-1834695149 +python: # [osx] + - 3.8.* *_cpython # [osx] + - 3.9.* *_cpython # [osx] + - 3.10.* *_cpython # [osx] + - 3.11.* *_cpython # [osx] +python_impl: # [osx] + - cpython # [osx] + - cpython # [osx] + - cpython # [osx] + - cpython # [osx] +numpy: # [osx] + - 1.22 # [osx] + - 1.22 # [osx] + - 1.22 # [osx] + - 1.23 # [osx] From 22cb2abee5ddeefa7a972887b03c0e312feb98c6 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Thu, 23 May 2024 14:28:37 -0400 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.23.15.13.04 --- .ci_support/linux_64_fmt10spdlog1.13.yaml | 2 ++ .ci_support/linux_64_fmt9spdlog1.11.yaml | 2 ++ .ci_support/osx_arm64_.yaml | 2 ++ .gitattributes | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.ci_support/linux_64_fmt10spdlog1.13.yaml b/.ci_support/linux_64_fmt10spdlog1.13.yaml index c8f089f3..f32d01d9 100644 --- a/.ci_support/linux_64_fmt10spdlog1.13.yaml +++ b/.ci_support/linux_64_fmt10spdlog1.13.yaml @@ -19,6 +19,7 @@ fmt: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' pin_run_as_build: @@ -31,6 +32,7 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython r_base: diff --git a/.ci_support/linux_64_fmt9spdlog1.11.yaml b/.ci_support/linux_64_fmt9spdlog1.11.yaml index 3351eaf5..59eb95f8 100644 --- a/.ci_support/linux_64_fmt9spdlog1.11.yaml +++ b/.ci_support/linux_64_fmt9spdlog1.11.yaml @@ -19,6 +19,7 @@ fmt: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' pin_run_as_build: @@ -31,6 +32,7 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython r_base: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6426811c..ba83c83c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true