From f4a671f2b6c30dc72628994612e8b1998bd2f64c Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 16:15:47 +0200 Subject: [PATCH 01/17] Update to v3.21.0 --- recipe/meta.yaml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0b163d7..6741c6c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,8 @@ {% set name = "blpapi" %} -{% set version = "3.19.1" %} -{% set blpapicpp_linux_version = "3.19.1.1" %} -{% set blpapicpp_win_version = "3.19.1.1" %} -{% set blpapicpp_osx_version = "3.19.1.1" %} +{% set version = "3.21.0" %} +{% set blpapicpp_linux_version = "3.21.0.1" %} +{% set blpapicpp_win_version = "3.21.0.1" %} +{% set blpapicpp_osx_version = "3.21.0.1" %} package: @@ -11,20 +11,24 @@ package: source: - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: d85f6c41eb4ba17ab594d7a497a7960cf759943a23ed157b82d56372105352e9 + sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_linux_version }}-linux.tar.gz # [linux] - sha256: d68ffe4e30a6dcc37a1884013dc67312802b1bdd7a4886ead5ac783bcfb1f180 # [linux] + sha256: 456123d318577b983ed5290c17b613a1088e17dba0b6652143f3041dd445c509 # [linux] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_win_version }}-windows.zip # [win] - sha256: 55eea42d5587df52c39157ba9285c41f2cf4034d7fc614244cd1e58c9297d308 # [win] + sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] - sha256: d6d23831db85a674a0d647d2d2deac3e9aa9ada699e1588ab5f128d453e185ba # [osx] + sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx] + sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx] - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx] - sha256: 4f50344150daf2e7c9857aa336176b53311b3b66e0fc4a7afacec41940b679ff # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_universal2.whl # [osx] - sha256: b4fbddc9c996c3ad4bb4313f596fe713171423f6d6425dbde6c3c2deda6652a9 # [osx] + sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx] + sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx] + sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx] build: - number: 1 + number: 0 requirements: build: From 1441d9c77f19dad07efff8f11d4cbd730a2bb2c6 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 16:17:12 +0200 Subject: [PATCH 02/17] Remove MacOS X wheels --- recipe/meta.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6741c6c..dc2e4ee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,14 +18,6 @@ source: sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx] - sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx] - sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx] - sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx] - sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx] build: number: 0 From 707b75e6c2754edcd8ef76ac9d6daca9a82da2ee Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 16:35:40 +0200 Subject: [PATCH 03/17] Revert "Remove MacOS X wheels" This reverts commit 1441d9c77f19dad07efff8f11d4cbd730a2bb2c6. --- recipe/meta.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc2e4ee..6741c6c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,14 @@ source: sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx] + sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx] + sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx] + sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx] + sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx] build: number: 0 From 5eaa1d3c9aad9da45cc6d952d32811f97279225f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:40:41 +0000 Subject: [PATCH 04/17] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.09.13.48.36 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- .azure-pipelines/azure-pipelines-win.yml | 6 +++--- .ci_support/linux_64_python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/linux_64_python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_64_python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 6 +++--- README.md | 8 ++++---- 17 files changed, 24 insertions(+), 29 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index dcb0f13..68e6c21 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -35,11 +35,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9594b7b..3e23e0f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_python3.10.____cpython: @@ -51,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -75,7 +75,7 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 73f6c40..185f425 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 08c60ad..16191cd 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml index 1326987..19aa2a2 100644 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.8.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index add75c6..17b57e2 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index 04699aa..ed87da3 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 3c17e2b..27b9f77 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index dcebd32..7315af6 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index f763043..f12df5c 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index b2aeb36..5034ea9 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index ac04b31..e01d345 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index f8f6a98..5adc198 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 9710251..07377f5 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..595f8b5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..5ef2a19 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index 04429dc..d374094 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About blpapi -============ +About blpapi-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/blpapi-feedstock/blob/main/LICENSE.txt) Home: https://www.bloomberg.com/professional/support/api-library/ Package license: Copyright 2012. Bloomberg Finance L.P. -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/blpapi-feedstock/blob/main/LICENSE.txt) - Summary: Python SDK for Bloomberg BLPAPI (<=3.9) Current build status From 33e996f5336b6f83d3b43c78d04cbd3536c7e090 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 18:12:58 +0200 Subject: [PATCH 05/17] Add python version selectors to osx wheel --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6741c6c..c0c14c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,14 +18,14 @@ source: sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx] - sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx] - sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx] - sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx] - sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx and py==38] + sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx and py==38] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx and py==39] + sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx and py==39] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx and py==310] + sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx and py==310] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx and py==311] + sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx and py==311] build: number: 0 From 5f1545c2dab24dd7b064ab7030f6d0d1f7d8c15f Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 19:50:12 +0200 Subject: [PATCH 06/17] Attempt to build against library from wheel instead --- recipe/bld.bat | 2 +- recipe/build.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 0a0dfdd..2b1bc26 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,5 +1,5 @@ set BLPAPI_ROOT=%CD% copy "%BLPAPI_ROOT%"\lib\ "%PREFIX%"\Library\bin if errorlevel 1 exit 1 -"%PYTHON%" setup.py install +"%PYTHON%" -m pip install --no-deps --ignore-installed . if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index cb479d5..f25fa86 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,7 +1,12 @@ #!/bin/bash export BLPAPI_ROOT="." -$PYTHON setup.py install + +if [ -d "$BLPAPI_ROOT/Darwin"]; then + cp -v blpapi/.dylibs/lib*.so $BLPAPI_ROOT/Darwin/ +fi + +$PYTHON -m pip install --no-deps --ignore-installed . if [ -d "$BLPAPI_ROOT/Linux" ]; then cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ From c7101457eca33bbd3796d31e1bc7074d89a2bcec Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 20:55:59 +0200 Subject: [PATCH 07/17] Add some debug output --- recipe/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index f25fa86..8e0d3bc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,8 +2,10 @@ export BLPAPI_ROOT="." -if [ -d "$BLPAPI_ROOT/Darwin"]; then - cp -v blpapi/.dylibs/lib*.so $BLPAPI_ROOT/Darwin/ +if [ -d "$BLPAPI_ROOT/Darwin" ]; then + echo "Copying dynamic library from python wheel" + ls ./blpapi + cp -v ./blpapi/.dylibs/lib*.so $BLPAPI_ROOT/Darwin/ fi $PYTHON -m pip install --no-deps --ignore-installed . From f2b994c634984c57b960d00a1fd6547cc34ab202 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 21:19:50 +0200 Subject: [PATCH 08/17] Attempt to install MacOS version from wheels --- recipe/build.sh | 11 ++--------- recipe/meta.yaml | 15 +++------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 8e0d3bc..471d140 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,16 +2,9 @@ export BLPAPI_ROOT="." -if [ -d "$BLPAPI_ROOT/Darwin" ]; then - echo "Copying dynamic library from python wheel" - ls ./blpapi - cp -v ./blpapi/.dylibs/lib*.so $BLPAPI_ROOT/Darwin/ -fi - -$PYTHON -m pip install --no-deps --ignore-installed . - if [ -d "$BLPAPI_ROOT/Linux" ]; then + $PYTHON -m pip install --no-deps --ignore-installed . cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ else - cp -v $BLPAPI_ROOT/Darwin/lib*.so $PREFIX/lib/ + $PYTHON -m pip install --no-deps --ignore-installed --index-url=https://bcms.bloomberg.com/pip/simple $PKG_NAME==$PKG_VERSION fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0c14c5..0d1d7ce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,25 +10,16 @@ package: version: {{ version }} source: - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz # [not osx] + sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba # [not osx] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_linux_version }}-linux.tar.gz # [linux] sha256: 456123d318577b983ed5290c17b613a1088e17dba0b6652143f3041dd445c509 # [linux] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_win_version }}-windows.zip # [win] sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] - - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] - sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp38-cp38-macosx_10_9_x86_64.whl # [osx and py==38] - sha256: 328b76d28c7090edd3bb82800a3bc9f2219b1607ef68312f5927cb788022f22f # [osx and py==38] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp39-cp39-macosx_10_9_x86_64.whl # [osx and py==39] - sha256: bd19dd9c5ed5ec9a486238aab31626c6a942afe1ba71c97b65baf63316d41266 # [osx and py==39] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp310-cp310-macosx_10_9_x86_64.whl # [osx and py==310] - sha256: ccc7943271dfde3e0d2e753f57ac5d4746469676f9a1c3a1288ba987c0c78ada # [osx and py==310] - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}-cp311-cp311-macosx_10_9_x86_64.whl # [osx and py==311] - sha256: b6ed7ed142d3bdd589d463fff541c1000c4e64163f5d6ed5f3772eb329f5a65f # [osx and py==311] build: number: 0 + skip: True # [python_impl == 'pypy' and osx] requirements: build: From 044cf7fa93e885474d799959375f738f2bf3c6a2 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Wed, 9 Aug 2023 21:35:18 +0200 Subject: [PATCH 09/17] Verbose output from pip install --- recipe/build.sh | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 471d140..c64dd73 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,5 +6,5 @@ if [ -d "$BLPAPI_ROOT/Linux" ]; then $PYTHON -m pip install --no-deps --ignore-installed . cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ else - $PYTHON -m pip install --no-deps --ignore-installed --index-url=https://bcms.bloomberg.com/pip/simple $PKG_NAME==$PKG_VERSION + $PYTHON -m pip install -v --no-deps --ignore-installed --index-url=https://bcms.bloomberg.com/pip/simple $PKG_NAME==$PKG_VERSION fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0d1d7ce..f6e2d67 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ package: version: {{ version }} source: - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz # [not osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz # [not osx] sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba # [not osx] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_linux_version }}-linux.tar.gz # [linux] sha256: 456123d318577b983ed5290c17b613a1088e17dba0b6652143f3041dd445c509 # [linux] From c526f66acc4a56f8901b029651f56b37349dddf7 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Thu, 10 Aug 2023 07:55:34 +0200 Subject: [PATCH 10/17] Install from wheel url on MacOS X --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index c64dd73..d3a5a3f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,5 +6,6 @@ if [ -d "$BLPAPI_ROOT/Linux" ]; then $PYTHON -m pip install --no-deps --ignore-installed . cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ else - $PYTHON -m pip install -v --no-deps --ignore-installed --index-url=https://bcms.bloomberg.com/pip/simple $PKG_NAME==$PKG_VERSION + PY_VER_NO_DOT = $(echo $PY_VER | tr -d .) + $PYTHON -m pip install -vvv --no-deps --ignore-installed https://bcms.bloomberg.com/pip/simple/$PKG_NAME/$PKG_NAME-$PKG_VERSION-cp$PY_VER_NO_DOT-cp$PY_VER_NO_DOT-macosx_10_9_x86_64.whl fi From e10e0b586e3ac1bb1c45343b9fd0e12d2142a106 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Thu, 10 Aug 2023 08:09:54 +0200 Subject: [PATCH 11/17] Fix shell variable syntax in build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d3a5a3f..67520e1 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,6 +6,6 @@ if [ -d "$BLPAPI_ROOT/Linux" ]; then $PYTHON -m pip install --no-deps --ignore-installed . cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ else - PY_VER_NO_DOT = $(echo $PY_VER | tr -d .) + PY_VER_NO_DOT=$(echo $PY_VER | tr -d .) $PYTHON -m pip install -vvv --no-deps --ignore-installed https://bcms.bloomberg.com/pip/simple/$PKG_NAME/$PKG_NAME-$PKG_VERSION-cp$PY_VER_NO_DOT-cp$PY_VER_NO_DOT-macosx_10_9_x86_64.whl fi From d1bfeefd4124a60d0da85afdf104f5a56249a1f8 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Thu, 10 Aug 2023 08:51:30 +0200 Subject: [PATCH 12/17] Update MacOS X dependency to 12.0 The C++ library is built for MacOS X 12.0 and despite what the file name of the python wheel indicates, the C++ library in the wheel is also built for 12.0. So we might as well build the python module from source. --- recipe/build.sh | 6 +++--- recipe/conda_build_config.yaml | 5 +++++ recipe/meta.yaml | 9 +++++---- 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/build.sh b/recipe/build.sh index 67520e1..0e44db8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,10 +2,10 @@ export BLPAPI_ROOT="." +$PYTHON -m pip install --no-deps --ignore-installed . + if [ -d "$BLPAPI_ROOT/Linux" ]; then - $PYTHON -m pip install --no-deps --ignore-installed . cp -v $BLPAPI_ROOT/Linux/lib*.so $PREFIX/lib/ else - PY_VER_NO_DOT=$(echo $PY_VER | tr -d .) - $PYTHON -m pip install -vvv --no-deps --ignore-installed https://bcms.bloomberg.com/pip/simple/$PKG_NAME/$PKG_NAME-$PKG_VERSION-cp$PY_VER_NO_DOT-cp$PY_VER_NO_DOT-macosx_10_9_x86_64.whl + cp -v $BLPAPI_ROOT/Darwin/lib*.so $PREFIX/lib/ fi diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..7e6a298 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,5 @@ +# Please consult conda-forge/core before doing this +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "12.0" # [osx and x86_64] +MACOSX_SDK_VERSION: # [osx and x86_64] + - "12.0" # [osx and x86_64] \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f6e2d67..72b9749 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,16 +10,17 @@ package: version: {{ version }} source: - - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz # [not osx] - sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba # [not osx] + - url: https://bcms.bloomberg.com/pip/simple/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 6e9034cc8ad976615a49e2e4694cd1948e90a91438f842c8a7e2e01073470aba - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_linux_version }}-linux.tar.gz # [linux] sha256: 456123d318577b983ed5290c17b613a1088e17dba0b6652143f3041dd445c509 # [linux] - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_win_version }}-windows.zip # [win] sha256: 4976c859ecef574c3cd9a656677f180c97493efb6df98a2f18f04c34894d5943 # [win] + - url: https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_{{ blpapicpp_osx_version }}-macos.tar.gz # [osx] + sha256: eaf9f3e5caede1655277d19d5f78d9f2c5a6d9f922056eef323fe57d3a9734ee # [osx] build: number: 0 - skip: True # [python_impl == 'pypy' and osx] requirements: build: @@ -29,7 +30,7 @@ requirements: - pip run: - python - + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: imports: - blpapi From 85899f9fbfbbe983dc21c140d12ea2f64af24f72 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 06:56:58 +0000 Subject: [PATCH 13/17] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.09.23.48.41 --- .ci_support/osx_64_python3.10.____cpython.yaml | 4 +++- .ci_support/osx_64_python3.11.____cpython.yaml | 4 +++- .ci_support/osx_64_python3.8.____73_pypy.yaml | 4 +++- .ci_support/osx_64_python3.8.____cpython.yaml | 4 +++- .ci_support/osx_64_python3.9.____73_pypy.yaml | 4 +++- .ci_support/osx_64_python3.9.____cpython.yaml | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 7315af6..c24598b 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index f12df5c..9a7011d 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index 5034ea9..af4a92f 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index e01d345..e74563f 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index 5adc198..f56f39d 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 07377f5..df31cfd 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.0' +MACOSX_SDK_VERSION: +- '12.0' channel_sources: - conda-forge channel_targets: From 9f6fccb807859c8f89ce15d1f2401e302777c330 Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Thu, 10 Aug 2023 14:29:50 +0200 Subject: [PATCH 14/17] Attempt to build against MacOS X 11.0 SDK --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 7e6a298..c854e8e 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,5 @@ # Please consult conda-forge/core before doing this MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "12.0" # [osx and x86_64] + - "11.0" # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - - "12.0" # [osx and x86_64] \ No newline at end of file + - "11.0" # [osx and x86_64] From 1a5cbe0b99803f29e2dd1b7781a47f9225cceade Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:45:48 +0000 Subject: [PATCH 15/17] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.10.11.52.27 --- .ci_support/osx_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.8.____73_pypy.yaml | 4 ++-- .ci_support/osx_64_python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.9.____73_pypy.yaml | 4 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index c24598b..6fd85f2 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 9a7011d..23c8629 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index af4a92f..0e12178 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index e74563f..eb133d9 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index f56f39d..d29fc9d 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index df31cfd..9ca0b76 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '11.0' MACOSX_SDK_VERSION: -- '12.0' +- '11.0' channel_sources: - conda-forge channel_targets: From 58a9ff1173da219bcad1f889fe9bc2e18a64028a Mon Sep 17 00:00:00 2001 From: Adam Ehlers Nyholm Thomsen Date: Thu, 10 Aug 2023 15:29:52 +0200 Subject: [PATCH 16/17] Attempt build against MacOS X SDK 11.3 --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index c854e8e..aac66e8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,5 @@ # Please consult conda-forge/core before doing this MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "11.0" # [osx and x86_64] + - "11.3" # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - - "11.0" # [osx and x86_64] + - "11.3" # [osx and x86_64] From f40e5105b3f9cdbecbe8d90b083b4bd9101e7625 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:34:20 +0000 Subject: [PATCH 17/17] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.10.11.52.27 --- .ci_support/osx_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.8.____73_pypy.yaml | 4 ++-- .ci_support/osx_64_python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.9.____73_pypy.yaml | 4 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 6fd85f2..44dc99e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 23c8629..48a79a6 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index 0e12178..52e3b1d 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index eb133d9..dbe0a87 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index d29fc9d..637a771 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 9ca0b76..bcbd0b4 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '11.3' MACOSX_SDK_VERSION: -- '11.0' +- '11.3' channel_sources: - conda-forge channel_targets: