diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 91db770..80a146e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -23,6 +23,21 @@ jobs: osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython 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 steps: 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..8c40d80 --- /dev/null +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-arm64 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..e8a2717 --- /dev/null +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-arm64 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..afd8db9 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-arm64 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..9ea9418 --- /dev/null +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-arm64 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..1646a66 --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +rust_compiler: +- rust +target_platform: +- osx-arm64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f017291..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -46,6 +46,9 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi ( endgroup "Configuring conda" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 1fa8468..9259eb9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -77,6 +77,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then /bin/bash else + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7bde26b..48734de 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -41,6 +41,11 @@ if EXIST LICENSE.txt ( echo Copying feedstock license copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) if NOT [%flow_run_id%] == [] ( set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" diff --git a/README.md b/README.md index c906eef..d18d4aa 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.____cpython diff --git a/conda-forge.yml b/conda-forge.yml index 7bb29fb..c957e72 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,12 @@ -github: - branch_name: main - tooling_branch_name: main -conda_build: - error_overlinking: true -conda_forge_output_validation: true bot: automerge: true inspection: update-grayskull +build_platform: + osx_arm64: osx_64 +conda_build: + error_overlinking: true +conda_forge_output_validation: true +github: + branch_name: main + tooling_branch_name: main +test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 839d67c..fe0d6f7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,8 @@ build: requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] - maturin >=1,<2 - make - {{ compiler('rust') }}