From f80d04c741b452301ece416f4255d152f1633570 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 11:06:44 -0700 Subject: [PATCH 01/11] add osx-arm64 --- conda-forge.yml | 2 ++ recipe/meta.yaml | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 2f501ce..022d99c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -4,3 +4,5 @@ github: tooling_branch_name: main conda_build: pkg_format: '2' +build_platform: + osx_arm64: osx_64 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0b20684..8842e56 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: build: skip: true # [python_impl == 'pypy'] - number: 0 + number: 1 script: - copy /y "{{ LIBRARY_INC }}\capnp\*.capnp" .\capnp\ # [win] - cp -f {{ PREFIX }}/include/capnp/*.capnp ./capnp/ # [not win] @@ -23,6 +23,10 @@ build: requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + # <3 because https://github.com/capnproto/pycapnp/issues/319 + - cython <3 # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} host: @@ -36,7 +40,7 @@ requirements: - python run: - python - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] test: source_files: From e7378ae3f77d93475bf3fa4113b188e8ed1e750a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:09:14 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.09.17.01.06 --- .azure-pipelines/azure-pipelines-osx.yml | 15 ++++++++ ...hon3.10.____cpythonpython_implcpython.yaml | 2 +- ...hon3.11.____cpythonpython_implcpython.yaml | 2 +- ...hon3.12.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- .../osx_arm64_python3.10.____cpython.yaml | 35 +++++++++++++++++++ .../osx_arm64_python3.11.____cpython.yaml | 35 +++++++++++++++++++ .../osx_arm64_python3.12.____cpython.yaml | 35 +++++++++++++++++++ .../osx_arm64_python3.8.____cpython.yaml | 35 +++++++++++++++++++ .../osx_arm64_python3.9.____cpython.yaml | 35 +++++++++++++++++++ .scripts/build_steps.sh | 7 ++++ .scripts/run_osx_build.sh | 7 ++++ .scripts/run_win_build.bat | 5 +++ README.md | 35 +++++++++++++++++++ 15 files changed, 249 insertions(+), 5 deletions(-) create mode 100644 .ci_support/osx_arm64_python3.10.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.11.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.8.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 72832f1..5104c90 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -23,6 +23,21 @@ jobs: osx_64_python3.9.____cpythonpython_implcpython: CONFIG: osx_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index 6b379e9..040b1b9 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: capnproto: - 1.0.2 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index 373b904..ddc68e6 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: capnproto: - 1.0.2 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml index 672ef02..7323877 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: capnproto: - 1.0.2 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index 935dddc..547a28d 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: capnproto: - 1.0.2 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index ec51b5c..ca33f0f 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: capnproto: - 1.0.2 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml new file mode 100644 index 0000000..9af325e --- /dev/null +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +capnproto: +- 1.0.2 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml new file mode 100644 index 0000000..6de6fb1 --- /dev/null +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +capnproto: +- 1.0.2 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml new file mode 100644 index 0000000..ce636e9 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +capnproto: +- 1.0.2 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml new file mode 100644 index 0000000..d900d81 --- /dev/null +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +capnproto: +- 1.0.2 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml new file mode 100644 index 0000000..1ba213c --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +capnproto: +- 1.0.2 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - python_impl diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,13 @@ else --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:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 165fa51..0c9e992 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,6 +81,13 @@ else --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" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7491838..24ef201 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -53,6 +53,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index b1e6a1c..7e3de1f 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,41 @@ Current build status variant + + osx_arm64_python3.10.____cpython + + + variant + + + + osx_arm64_python3.11.____cpython + + + variant + + + + osx_arm64_python3.12.____cpython + + + variant + + + + osx_arm64_python3.8.____cpython + + + variant + + + + osx_arm64_python3.9.____cpython + + + variant + + win_64_python3.10.____cpythonpython_implcpython From 82024b76e95034f72f787d4e91d5dbf52cc32523 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 11:16:33 -0700 Subject: [PATCH 03/11] add build requirement, add versions for arm64 --- recipe/conda_build_config.yaml | 4 +++- recipe/meta.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3c2447e..c8299c8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "10.12" # [osx and x86_64] + - "11.0" # [osx and arm64] MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.12" # [osx and x86_64] \ No newline at end of file + - "10.12" # [osx and x86_64] + - "11.0" # [osx and arm64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8842e56..8077e70 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,12 +23,14 @@ build: requirements: build: + - capnproto # [build_platform != target_platform] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] # <3 because https://github.com/capnproto/pycapnp/issues/319 - cython <3 # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ stdlib('c') }} host: - capnproto # <3 because https://github.com/capnproto/pycapnp/issues/319 From 6945f594b4be2f82fd91a6718fd4c5f9dbfd6147 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 11:34:40 -0700 Subject: [PATCH 04/11] fix conda_build_config.yaml --- 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 c8299c8..df3e4a7 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,6 @@ -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: # [osx] - "10.12" # [osx and x86_64] - "11.0" # [osx and arm64] -MACOSX_SDK_VERSION: # [osx and x86_64] +MACOSX_SDK_VERSION: # [osx] - "10.12" # [osx and x86_64] - "11.0" # [osx and arm64] From 63c0a3a10e2a16b88c972c8a52fa4b95f7eb3fb0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:36:28 +0000 Subject: [PATCH 05/11] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.09.17.01.06 --- .../linux_64_python3.10.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.11.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.12.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.8.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.9.____cpythonpython_implcpython.yaml | 6 ++++++ .../osx_64_python3.10.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.11.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.12.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.8.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.9.____cpythonpython_implcpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.10.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.11.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.12.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.8.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.9.____cpython.yaml | 4 ++++ .../win_64_python3.10.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.11.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.12.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.8.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.9.____cpythonpython_implcpython.yaml | 2 ++ 20 files changed, 80 insertions(+) diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index 040b1b9..cdce7dc 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' capnproto: - 1.0.2 cdt_name: @@ -29,5 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index ddc68e6..5cc1b0a 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' capnproto: - 1.0.2 cdt_name: @@ -29,5 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml index 7323877..5661168 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' capnproto: - 1.0.2 cdt_name: @@ -29,5 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index 547a28d..c9ad5bf 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' capnproto: - 1.0.2 cdt_name: @@ -29,5 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index ca33f0f..4d6c448 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' capnproto: - 1.0.2 cdt_name: @@ -29,5 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 6beb544..183aac5 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index 87f6919..099080d 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml index 6238aff..4c5f104 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index 4c92dc4..29cec72 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index be07faa..60dc521 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 9af325e..9eac192 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 6de6fb1..6f060ee 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index ce636e9..68da4b5 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index d900d81..99a4de7 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 1ba213c..a32a415 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml index 787f084..c2dcfa9 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml index bc4f209..42df32f 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml index cd75882..b8a97a0 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml index e42ed9d..1e7b49e 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs capnproto: - 1.0.2 channel_sources: diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml index b5e8459..65b5dbf 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs capnproto: - 1.0.2 channel_sources: From 343310bbc11228c371171294794036d3392ea391 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 11:57:13 -0700 Subject: [PATCH 06/11] force-system-libcapnp --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8077e70..4b64666 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,8 +18,7 @@ build: script: - copy /y "{{ LIBRARY_INC }}\capnp\*.capnp" .\capnp\ # [win] - cp -f {{ PREFIX }}/include/capnp/*.capnp ./capnp/ # [not win] - - pip install . -C force-system-libcapnp=True # [win] - - pip install . # [not win] + - pip install . -C force-system-libcapnp=True requirements: build: From d68ce1c80331ec97c93b0d3fdf4f1a4f26d94d45 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 15:06:47 -0700 Subject: [PATCH 07/11] don't specify macos versions --- recipe/conda_build_config.yaml | 6 ------ recipe/meta.yaml | 1 - 2 files changed, 7 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index df3e4a7..0000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: # [osx] - - "10.12" # [osx and x86_64] - - "11.0" # [osx and arm64] -MACOSX_SDK_VERSION: # [osx] - - "10.12" # [osx and x86_64] - - "11.0" # [osx and arm64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b64666..0d62daf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,6 @@ requirements: - python run: - python - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] test: source_files: From aa60cfec0c6d8f742e24a0f635023910f7659bd8 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 15:42:52 -0700 Subject: [PATCH 08/11] put pip flag first --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0d62daf..3d41ff6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ build: script: - copy /y "{{ LIBRARY_INC }}\capnp\*.capnp" .\capnp\ # [win] - cp -f {{ PREFIX }}/include/capnp/*.capnp ./capnp/ # [not win] - - pip install . -C force-system-libcapnp=True + - pip install --config-settings="force-system-libcapnp=True" . requirements: build: From 386144589e8d19f335229148431a10111ab2471b Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 16:02:00 -0700 Subject: [PATCH 09/11] invoke setup.py directly --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d41ff6..b4a39ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ build: script: - copy /y "{{ LIBRARY_INC }}\capnp\*.capnp" .\capnp\ # [win] - cp -f {{ PREFIX }}/include/capnp/*.capnp ./capnp/ # [not win] - - pip install --config-settings="force-system-libcapnp=True" . + - python setup.py build_ext --force-system-libcapnp install requirements: build: From fe4da1d7ca2127b066090a6376b1b734b4b15b90 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 16:27:06 -0700 Subject: [PATCH 10/11] skip tests --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4a39ef..76e02a1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,8 @@ build: script: - copy /y "{{ LIBRARY_INC }}\capnp\*.capnp" .\capnp\ # [win] - cp -f {{ PREFIX }}/include/capnp/*.capnp ./capnp/ # [not win] + # Can't use `pip install` because it doesn't seem there's a way to set this + # argument that way. - python setup.py build_ext --force-system-libcapnp install requirements: @@ -43,6 +45,7 @@ requirements: - python test: + skip: true # [build_platform != target_platform] source_files: - test - examples From a9cd6b3eea0beff4acfc12586f37da9bf9bf4b31 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Tue, 9 Jul 2024 16:29:09 -0700 Subject: [PATCH 11/11] skip tests properly --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 76e02a1..03195f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,7 +45,6 @@ requirements: - python test: - skip: true # [build_platform != target_platform] source_files: - test - examples @@ -54,9 +53,9 @@ test: - pytest - pytest-asyncio imports: - - capnp + - capnp # [build_platform == target_platform] commands: - - pytest test + - pytest test # [build_platform == target_platform] about: home: https://github.com/capnproto/pycapnp