diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c8dc849a1..c29c8067f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,6 +16,14 @@ jobs: CONFIG: win_64_freethreadingyes UPLOAD_PACKAGES: 'True' SHORT_CONFIG: win_64_freethreadingyes + win_arm64_freethreadingno: + CONFIG: win_arm64_freethreadingno + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_arm64_freethreadingno + win_arm64_freethreadingyes: + CONFIG: win_arm64_freethreadingyes + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_arm64_freethreadingyes timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/win_arm64_freethreadingno.yaml b/.ci_support/win_arm64_freethreadingno.yaml new file mode 100644 index 000000000..d28d274ce --- /dev/null +++ b/.ci_support/win_arm64_freethreadingno.yaml @@ -0,0 +1,41 @@ +build_type: +- release +bzip2: +- '1' +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2022 +expat: +- '2' +freethreading: +- 'no' +libffi: +- '3.5' +liblzma_devel: +- '5' +libsqlite: +- '3' +openssl: +- '3.5' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.13' +target_platform: +- win-arm64 +tk: +- '8.6' +zip_keys: +- - build_type + - channel_targets +zlib: +- '1' diff --git a/.ci_support/win_arm64_freethreadingyes.yaml b/.ci_support/win_arm64_freethreadingyes.yaml new file mode 100644 index 000000000..5307b2b50 --- /dev/null +++ b/.ci_support/win_arm64_freethreadingyes.yaml @@ -0,0 +1,41 @@ +build_type: +- release +bzip2: +- '1' +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2022 +expat: +- '2' +freethreading: +- 'yes' +libffi: +- '3.5' +liblzma_devel: +- '5' +libsqlite: +- '3' +openssl: +- '3.5' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.13' +target_platform: +- win-arm64 +tk: +- '8.6' +zip_keys: +- - build_type + - channel_targets +zlib: +- '1' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 361edeb2c..bac7141a9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/README.md b/README.md index 78eed68b8..84b4babd1 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,20 @@ Current build status variant + + win_arm64_freethreadingno + + + variant + + + + win_arm64_freethreadingyes + + + variant + + diff --git a/conda-forge.yml b/conda-forge.yml index 3bdeb3233..a02a12a3b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,6 +11,7 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 + win_arm64: win_64 conda_build: pkg_format: '2' conda_forge_output_validation: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ea1b1eea0..07defb9bd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -83,6 +83,8 @@ build: requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] - patch # [not win] - m2-patch # [win] - m2-gcc-libs # [win]