From b0e05925fb6626d33760590d1dd5b04fda04a4db Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 07:54:14 +0000 Subject: [PATCH 01/19] migration: ArchRebuild --- conda-forge.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 01bbc78..395bb83 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,9 +2,11 @@ azure: free_disk_space: true settings_linux: swapfile_size: 10GiB +bot: + automerge: true build_platform: - osx_arm64: osx_64 linux_aarch64: linux_64 + osx_arm64: osx_64 conda_build: pkg_format: '2' conda_forge_output_validation: true @@ -13,7 +15,6 @@ github: tooling_branch_name: main provider: linux_aarch64: default + linux_ppc64le: default win: azure test: native_and_emulated -bot: - automerge: true From ac08e80dbc767344ca9075d42c5b916174672b30 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 07:54:30 +0000 Subject: [PATCH 02/19] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and conda-forge-pinning 2024.03.21.15.27.47 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .../linux_ppc64le_python3.10.____cpython.yaml | 18 +++++++++ .../linux_ppc64le_python3.11.____cpython.yaml | 18 +++++++++ .../linux_ppc64le_python3.8.____cpython.yaml | 18 +++++++++ .../linux_ppc64le_python3.9.____cpython.yaml | 18 +++++++++ .gitignore | 5 ++- .scripts/build_steps.sh | 6 +-- .scripts/run_osx_build.sh | 6 +-- .scripts/run_win_build.bat | 4 +- .travis.yml | 40 +++++++++++++++++++ README.md | 37 ++++++++++++++++- azure-pipelines.yml | 4 +- build-locally.py | 5 ++- 14 files changed, 166 insertions(+), 15 deletions(-) create mode 100644 .ci_support/linux_ppc64le_python3.10.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.8.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.9.____cpython.yaml create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f011541..574d413 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -41,6 +41,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 19f48f7..fff017b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -33,6 +33,7 @@ jobs: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml new file mode 100644 index 0000000..df6730a --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +rust_compiler: +- rust +target_platform: +- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml new file mode 100644 index 0000000..c9dd86e --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +rust_compiler: +- rust +target_platform: +- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml new file mode 100644 index 0000000..e0276f4 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +rust_compiler: +- rust +target_platform: +- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml new file mode 100644 index 0000000..288d817 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +rust_compiler: +- rust +target_platform: +- linux-ppc64le diff --git a/.gitignore b/.gitignore index 62bf059..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,9 @@ * !/conda-forge.yml -# Don't ignore any subfolders if the parent folder is 'un-ignored' -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ # Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --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:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..8f1d87d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,40 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index d9c802b..f179f0b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,14 @@ Current build status ==================== - +
+ + + @@ -90,6 +97,34 @@ Current build status variant + + + + + + + + + + + + + + + - - -
Travis + + linux + +
Azure
linux_ppc64le_python3.10.____cpython + + variant + +
linux_ppc64le_python3.11.____cpython + + variant + +
linux_ppc64le_python3.8.____cpython + + variant + +
linux_ppc64le_python3.9.____cpython + + variant + +
osx_64_python3.10.____cpython diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 2b81736373c34b6e11704b92252f66992b8ab2fb Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:40:25 -0700 Subject: [PATCH 03/19] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.02.10.47.51 --- .../linux_ppc64le_python3.10.____cpython.yaml | 9 +++++++ .../linux_ppc64le_python3.11.____cpython.yaml | 9 +++++++ .../linux_ppc64le_python3.12.____cpython.yaml | 27 +++++++++++++++++++ .../linux_ppc64le_python3.8.____cpython.yaml | 9 +++++++ .../linux_ppc64le_python3.9.____cpython.yaml | 9 +++++++ .travis.yml | 9 +++++-- README.md | 7 +++++ 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 .ci_support/linux_ppc64le_python3.12.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index df6730a..49a44ef 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -6,6 +10,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le +libprotobuf: +- 4.25.3 pin_run_as_build: python: min_pin: x.x @@ -16,3 +22,6 @@ rust_compiler: - rust target_platform: - linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index c9dd86e..dfb0a4a 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -6,6 +10,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le +libprotobuf: +- 4.25.3 pin_run_as_build: python: min_pin: x.x @@ -16,3 +22,6 @@ rust_compiler: - rust target_platform: - linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml new file mode 100644 index 0000000..8bc2af6 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -0,0 +1,27 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libprotobuf: +- 4.25.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +rust_compiler: +- rust +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index e0276f4..5fb2d8f 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -6,6 +10,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le +libprotobuf: +- 4.25.3 pin_run_as_build: python: min_pin: x.x @@ -16,3 +22,6 @@ rust_compiler: - rust target_platform: - linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 288d817..0899c1a 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -6,6 +10,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le +libprotobuf: +- 4.25.3 pin_run_as_build: python: min_pin: x.x @@ -16,3 +22,6 @@ rust_compiler: - rust target_platform: - linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.travis.yml b/.travis.yml index 8f1d87d..ccc0c9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux @@ -17,6 +17,11 @@ matrix: arch: ppc64le dist: focal + - env: CONFIG=linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index d3e9b46..10d8c03 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,13 @@ Current build status variant
linux_ppc64le_python3.12.____cpython + + variant + +
linux_ppc64le_python3.8.____cpython From 6fcbc446c9a92d01c15e89d5c4252cbcdf9524c6 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:11:19 -0700 Subject: [PATCH 04/19] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.23.09.40.07 --- .../linux_ppc64le_python3.8.____cpython.yaml | 27 ------------------- .travis.yml | 5 ---- README.md | 7 ----- 3 files changed, 39 deletions(-) delete mode 100644 .ci_support/linux_ppc64le_python3.8.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml deleted file mode 100644 index 5fb2d8f..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -rust_compiler: -- rust -target_platform: -- linux-ppc64le -zip_keys: -- - c_stdlib_version - - cdt_name diff --git a/.travis.yml b/.travis.yml index ccc0c9b..9f68892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,6 @@ jobs: arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 30ce9a4..c332dd6 100644 --- a/README.md +++ b/README.md @@ -118,13 +118,6 @@ Current build status variant
linux_ppc64le_python3.8.____cpython - - variant - -
linux_ppc64le_python3.9.____cpython From 85a76994be96e4c669c6e2305ca8b33ef1857bc3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 11:27:46 -0700 Subject: [PATCH 05/19] Cross-compile all arch builds --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index bebb78a..6d70e55 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -9,6 +9,7 @@ bot: automerge: true build_platform: linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' From 3c0891daf39fe4f3d3ee8332a1b33d920c8bd860 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 18:31:24 +0000 Subject: [PATCH 06/19] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.02.13.37.37 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++++++++ .../linux_ppc64le_python3.10.____cpython.yaml | 2 +- .../linux_ppc64le_python3.11.____cpython.yaml | 2 +- .../linux_ppc64le_python3.12.____cpython.yaml | 2 +- .../linux_ppc64le_python3.9.____cpython.yaml | 2 +- .travis.yml | 40 ------------------- README.md | 9 +---- 7 files changed, 21 insertions(+), 52 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1d831cc..3c5b23a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -40,6 +40,22 @@ jobs: CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.9.____cpython: + CONFIG: linux_ppc64le_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 49a44ef..6e62039 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: - 4.25.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index dfb0a4a..380d4ab 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: - 4.25.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 8bc2af6..f28e29f 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: - 4.25.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 0899c1a..0da8adb 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: - 4.25.3 pin_run_as_build: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9f68892..0000000 --- a/.travis.yml +++ /dev/null @@ -1,40 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: shell - - - -jobs: - include: - - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index c332dd6..c8e6909 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
From fd3843dfa22b91989418a13c1ce4a0daa75876c8 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 12:04:44 -0700 Subject: [PATCH 07/19] Remove Docker images from Azure too --- conda-forge.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 6d70e55..fdbb1be 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,8 @@ azure: - free_disk_space: true + free_disk_space: + - apt + - cache + - docker settings_linux: swapfile_size: 10GiB settings_win: From 32dc9104a64c83e210d21bea48a8611c0c9df529 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 19:07:52 +0000 Subject: [PATCH 08/19] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.02.13.37.37 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3c5b23a..09daedc 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -79,6 +79,7 @@ jobs: microsoft-edge-stable sudo apt-get autoremove -y >& /dev/null sudo apt-get autoclean -y >& /dev/null + sudo docker image prune --all --force df -h displayName: Manage disk space - script: | From 3608b8ca6a39fca7309e5b0fb2a61fd7478fcd48 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 13:22:07 -0700 Subject: [PATCH 09/19] Drop `-fno-plt` on `linux_ppc64le` --- recipe/build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 056d760..7bf11cd 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -16,6 +16,15 @@ if [ "$c_compiler" = gcc ] ; then export CARGO_TARGET_${rust_env_arch}_LINKER=$CC fi +# Taken from clangdev's recipe +# https://github.com/conda-forge/clangdev-feedstock/blob/01fc5e3e0fc690db85151dcb3ff512e6aa876be7/recipe/build.sh#L51-L56 +# disable -fno-plt due to some GCC bug causing linker errors, see +# https://github.com/llvm/llvm-project/issues/51205 +if [[ "$target_platform" == "linux-ppc64le" ]]; then + CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')" + CXXFLAGS="$(echo $CXXFLAGS | sed 's/-fno-plt //g')" +fi + declare -a _xtra_maturin_args mkdir -p $SRC_DIR/.cargo From b7b4c91000fbb3d148e28c4a2da84ac0890590a7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 14:28:53 -0700 Subject: [PATCH 10/19] Run tests for native builds only --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index fdbb1be..290eeba 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -24,4 +24,4 @@ provider: linux_aarch64: default linux_ppc64le: default win: azure -test: native_and_emulated +test: native From e8165a5013bde24906afc56c93538cb8f5cbceb4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 21:32:29 +0000 Subject: [PATCH 11/19] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.02.19.54.49 --- .scripts/build_steps.sh | 3 +-- .scripts/run_win_build.bat | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..5ca92d7 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -48,11 +48,10 @@ 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 +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - ( endgroup "Configuring conda" ) 2> /dev/null if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index a45c34f..1f3b2be 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -42,9 +42,7 @@ if EXIST LICENSE.txt ( 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" - ) + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) if NOT [%flow_run_id%] == [] ( From dd0645baafdc375077cfaba105a3734e9622de21 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 15:34:45 -0700 Subject: [PATCH 12/19] Adapt testing for cross-compilation --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0bd4fa6..2030c02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,10 +33,10 @@ requirements: - typing_extensions test: - imports: - - datafusion commands: - pip check + - python -c 'from importlib.util import find_spec; assert find_spec("datafusion")' + - python -c 'import datafusion' # [build_platform != target_platform] requires: - pip From e29f8075ef8e61d59468234de623c571378d74d8 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 15:36:42 -0700 Subject: [PATCH 13/19] Enable testing when cross-compiling --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 290eeba..fdbb1be 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -24,4 +24,4 @@ provider: linux_aarch64: default linux_ppc64le: default win: azure -test: native +test: native_and_emulated From e8fe0395dfb5b64d7fe39b018287b5ace6946f9b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 22:40:15 +0000 Subject: [PATCH 14/19] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.02.19.54.49 --- .scripts/build_steps.sh | 3 ++- .scripts/run_win_build.bat | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5ca92d7..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -48,10 +48,11 @@ 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}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then +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 if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 1f3b2be..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -42,7 +42,9 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) ) if NOT [%flow_run_id%] == [] ( From 6c63ba6b7f2b59331cda02f53eb0fa3e868a5409 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 15:42:48 -0700 Subject: [PATCH 15/19] On Linux, use 20GiB swap file --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index fdbb1be..19cd1d5 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -4,7 +4,7 @@ azure: - cache - docker settings_linux: - swapfile_size: 10GiB + swapfile_size: 20GiB settings_win: variables: SET_PAGEFILE: 'True' From c64ef1a543a9d138a3ddaf1295180e4777b045f0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 22:45:50 +0000 Subject: [PATCH 16/19] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.02.19.54.49 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 09daedc..658007e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -83,7 +83,7 @@ jobs: df -h displayName: Manage disk space - script: | - sudo fallocate -l 10GiB /swapfile || true + sudo fallocate -l 20GiB /swapfile || true sudo chmod 600 /swapfile || true sudo mkswap /swapfile || true sudo swapon /swapfile || true From 6f2cafecdf10faf18ced33721800795277f4482f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 16:23:37 -0700 Subject: [PATCH 17/19] Fix comparison to only `import` on native --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2030c02..8da97da 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,7 +36,7 @@ test: commands: - pip check - python -c 'from importlib.util import find_spec; assert find_spec("datafusion")' - - python -c 'import datafusion' # [build_platform != target_platform] + - python -c 'import datafusion' # [build_platform == target_platform] requires: - pip From a4de1d227e17d1ce3bfbce0d7874d53754982494 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 16:24:23 -0700 Subject: [PATCH 18/19] Bump `build/number` to `1` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8da97da..e17f723 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: build: - number: 0 + number: 1 requirements: build: From 166dba69c5389ac8039291fe8da613f44ac0a777 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 2 Oct 2024 18:40:48 -0700 Subject: [PATCH 19/19] Changing quoting style in tests for Windows --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e17f723..d65dfaa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,8 +35,8 @@ requirements: test: commands: - pip check - - python -c 'from importlib.util import find_spec; assert find_spec("datafusion")' - - python -c 'import datafusion' # [build_platform == target_platform] + - python -c "from importlib.util import find_spec; assert find_spec('datafusion')" + - python -c "import datafusion" # [build_platform == target_platform] requires: - pip
Azure