From af071f7ffd798e77b89948f3e1070a012d104c83 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Oct 2024 20:14:42 +0000 Subject: [PATCH 01/20] migration: ArchRebuild --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index e76c3c6..292a7fe 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,5 +11,6 @@ github: tooling_branch_name: main provider: linux_aarch64: default + linux_ppc64le: default win: azure test: native_and_emulated From 8b5ca48ed73983a4f76f46977b5739423d5ec66f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Oct 2024 20:16:09 +0000 Subject: [PATCH 02/20] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.10.02.19.54.49 --- ...pc64le_numpy2.0python3.10.____cpython.yaml | 42 +++++++++++++++++ ...pc64le_numpy2.0python3.11.____cpython.yaml | 42 +++++++++++++++++ ...pc64le_numpy2.0python3.12.____cpython.yaml | 42 +++++++++++++++++ ...ppc64le_numpy2.0python3.9.____cpython.yaml | 42 +++++++++++++++++ ...ux_ppc64le_numpy2python3.13.____cp313.yaml | 42 +++++++++++++++++ .travis.yml | 45 +++++++++++++++++++ README.md | 44 +++++++++++++++++- 7 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml create mode 100644 .travis.yml diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml new file mode 100644 index 0000000..08f6ee0 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -0,0 +1,42 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.10.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml new file mode 100644 index 0000000..1b16d38 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -0,0 +1,42 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.11.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..48c2fbc --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.12.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml new file mode 100644 index 0000000..1b5bc2b --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -0,0 +1,42 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.9.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..230dbab --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -0,0 +1,42 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.13.* *_cp313 +target_platform: +- linux-ppc64le +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..085791a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,45 @@ +# 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_numpy2.0python3.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_numpy2.0python3.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_numpy2.0python3.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_numpy2.0python3.9.____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_numpy2python3.13.____cp313 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 817ee60..e2e38d7 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,14 @@ Current build status ==================== - +
+ + + @@ -114,6 +121,41 @@ Current build status variant + + + + + + + + + + + + + + +
Travis + + linux + +
Azure
linux_ppc64le_numpy2.0python3.10.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.11.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.12.____cpython + + variant + +
linux_ppc64le_numpy2.0python3.9.____cpython + + variant + +
linux_ppc64le_numpy2python3.13.____cp313 + + variant + +
osx_64_numpy2.0python3.10.____cpython From 4f11c670a35c6a9337b91f21bd243022d4fe3f5b Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Wed, 2 Oct 2024 16:32:46 -0400 Subject: [PATCH 03/20] Update conda-forge.yml --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 292a7fe..185f310 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,6 +2,7 @@ azure: store_build_artifacts: true build_platform: linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' From 5d1fcd2f184e718d73bd2487cba1778669809d43 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 20:38:25 +0000 Subject: [PATCH 04/20] 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 | 25 +++++++++++ ...pc64le_numpy2.0python3.10.____cpython.yaml | 2 +- ...pc64le_numpy2.0python3.11.____cpython.yaml | 2 +- ...pc64le_numpy2.0python3.12.____cpython.yaml | 2 +- ...ppc64le_numpy2.0python3.9.____cpython.yaml | 2 +- ...ux_ppc64le_numpy2python3.13.____cp313.yaml | 2 +- .travis.yml | 45 ------------------- README.md | 9 +--- 8 files changed, 31 insertions(+), 58 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 81203aa..5390301 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,6 +33,31 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_64_numpy2python3.13.____cp313 + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython + linux_ppc64le_numpy2python3.13.____cp313: + CONFIG: linux_ppc64le_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_numpy2python3.13.____cp313 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 08f6ee0..40200d4 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' libboost_devel: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 1b16d38..1954870 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' libboost_devel: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 48c2fbc..f2fea9c 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' libboost_devel: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 1b5bc2b..7454883 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' libboost_devel: diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index 230dbab..e3d7345 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' libboost_devel: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 085791a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +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_numpy2.0python3.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_numpy2.0python3.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_numpy2.0python3.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_numpy2.0python3.9.____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_numpy2python3.13.____cp313 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 e2e38d7..861fe95 100644 --- a/README.md +++ b/README.md @@ -66,14 +66,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
From 465178ee8d85320b4714c2fb61724e2af5afe3a8 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Wed, 2 Oct 2024 18:13:06 -0400 Subject: [PATCH 05/20] Update conda-forge.yml --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 185f310..3862952 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,6 @@ azure: store_build_artifacts: true build_platform: - linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: @@ -11,7 +10,6 @@ github: branch_name: main tooling_branch_name: main provider: - linux_aarch64: default linux_ppc64le: default win: azure test: native_and_emulated From 4239d63551a046674bb875d83efc45ea1d34b1c8 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Wed, 2 Oct 2024 18:17:57 -0400 Subject: [PATCH 06/20] Update meta.yaml --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e2789b5..af91635 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ requirements: - numpy # [build_platform != target_platform] - postgresql # [build_platform != target_platform] - python # [build_platform != target_platform] - - cmake + - cmake 3.29 - jom # [win] - make # [unix] - pkg-config @@ -61,7 +61,7 @@ outputs: build: - {{ compiler("cxx") }} - {{ stdlib("c") }} - - cmake + - cmake 3.29 host: - cairo - freetype @@ -82,7 +82,7 @@ outputs: requirements: build: - {{ stdlib("c") }} - - cmake + - cmake 3.29 run: - {{ pin_subpackage('librdkit', exact=True) }} test: @@ -104,7 +104,7 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - python # [build_platform != target_platform] - - cmake + - cmake 3.29 - jom # [win] - make # [unix] - pkg-config @@ -203,7 +203,7 @@ outputs: - {{ compiler('cxx') }} - {{ stdlib("c") }} - postgresql # [build_platform != target_platform] - - cmake + - cmake 3.29 host: - {{ pin_subpackage('librdkit', exact=True) }} - cairo From a41ec62bc25e4dc7d25680732886323a5ae6260a Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Wed, 2 Oct 2024 18:36:20 -0400 Subject: [PATCH 07/20] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index da20cf7..28ec1e1 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -27,7 +27,7 @@ time cmake ${CMAKE_ARGS} \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_PREFIX="${PREFIX}" \ -D PostgreSQL_CONFIG="${PG_CONFIG}" \ - -D PYTHON_EXECUTABLE="${PYTHON}" \ + -D Python_EXECUTABLE="${PYTHON}" \ -D RDK_BUILD_AVALON_SUPPORT=ON \ -D RDK_BUILD_CAIRO_SUPPORT=ON \ -D RDK_BUILD_CPP_TESTS=OFF \ From fa7863ea1c6fe3df69a12e4d8fb19e906bb344c8 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Wed, 2 Oct 2024 18:37:01 -0400 Subject: [PATCH 08/20] Update conda-forge.yml --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 3862952..185f310 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,7 @@ azure: store_build_artifacts: true build_platform: + linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: @@ -10,6 +11,7 @@ github: branch_name: main tooling_branch_name: main provider: + linux_aarch64: default linux_ppc64le: default win: azure test: native_and_emulated From 8c17c46f27db36ac1bcadc5970eecfb23b670d81 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 01:24:16 -0400 Subject: [PATCH 09/20] Update build.sh --- recipe/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 28ec1e1..93f8713 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,7 +12,8 @@ fi # Numpy cannot be found in ppc64le for some reason... some extra help will do ;) EXTRA_CMAKE_FLAGS="" if [ "${target_platform}" == "linux-ppc64le" ]; then - EXTRA_CMAKE_FLAGS+=" -D PYTHON_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/core/include" + EXTRA_CMAKE_FLAGS+=" -D PYTHON_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/_core/include" + EXTRA_CMAKE_FLAGS+=" -D Python_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" fi PG_CONFIG="$(which pg_config)" @@ -27,6 +28,7 @@ time cmake ${CMAKE_ARGS} \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_PREFIX="${PREFIX}" \ -D PostgreSQL_CONFIG="${PG_CONFIG}" \ + -D PYTHON_EXECUTABLE="${PYTHON}" \ -D Python_EXECUTABLE="${PYTHON}" \ -D RDK_BUILD_AVALON_SUPPORT=ON \ -D RDK_BUILD_CAIRO_SUPPORT=ON \ From 3a250ada4449fb2b6bf6771f6506b87c62560224 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 01:24:51 -0400 Subject: [PATCH 10/20] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index af91635..6357614 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: build: number: 1 - skip: true # [aarch64] + #skip: true # [aarch64] requirements: # See https://conda-forge.org/docs/maintainer/knowledge_base/#placing-requirements-in-build-or-host and From 9dbefe450068e2a7638e9a8fae108e6b0afeff4c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 05:30:33 +0000 Subject: [PATCH 11/20] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.03.02.22.40 --- .azure-pipelines/azure-pipelines-linux.yml | 25 ++++++++++ ...arch64_numpy2.0python3.10.____cpython.yaml | 46 +++++++++++++++++++ ...arch64_numpy2.0python3.11.____cpython.yaml | 46 +++++++++++++++++++ ...arch64_numpy2.0python3.12.____cpython.yaml | 46 +++++++++++++++++++ ...aarch64_numpy2.0python3.9.____cpython.yaml | 46 +++++++++++++++++++ ...ux_aarch64_numpy2python3.13.____cp313.yaml | 46 +++++++++++++++++++ README.md | 35 ++++++++++++++ 7 files changed, 290 insertions(+) create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5390301..62245a0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,6 +33,31 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_64_numpy2python3.13.____cp313 + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_numpy2.0python3.9.____cpython + linux_aarch64_numpy2python3.13.____cp313: + CONFIG: linux_aarch64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_numpy2python3.13.____cp313 linux_ppc64le_numpy2.0python3.10.____cpython: CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml new file mode 100644 index 0000000..9ac1400 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.10.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml new file mode 100644 index 0000000..613fd09 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.11.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..418d141 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.12.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml new file mode 100644 index 0000000..5cce715 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.9.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..ace17eb --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cairo: +- '1' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +postgresql: +- '16' +python: +- 3.13.* *_cp313 +target_platform: +- linux-aarch64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/README.md b/README.md index 861fe95..7ed8afd 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,41 @@ Current build status variant + + + + + + + + + + + + + + +
Azure
linux_aarch64_numpy2.0python3.10.____cpython + + variant + +
linux_aarch64_numpy2.0python3.11.____cpython + + variant + +
linux_aarch64_numpy2.0python3.12.____cpython + + variant + +
linux_aarch64_numpy2.0python3.9.____cpython + + variant + +
linux_aarch64_numpy2python3.13.____cp313 + + variant + +
linux_ppc64le_numpy2.0python3.10.____cpython From 6e730f93117b2f96eecfb79850a53b7cf14ecc38 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 03:01:29 -0400 Subject: [PATCH 12/20] Update build.sh --- recipe/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 93f8713..b1f5dcc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -11,9 +11,12 @@ fi # Numpy cannot be found in ppc64le for some reason... some extra help will do ;) EXTRA_CMAKE_FLAGS="" -if [ "${target_platform}" == "linux-ppc64le" ]; then +if [[ "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then EXTRA_CMAKE_FLAGS+=" -D PYTHON_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/_core/include" + EXTRA_CMAKE_FLAGS+=" -D PYTHON3_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/_core/include" EXTRA_CMAKE_FLAGS+=" -D Python_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" + EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" + EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIRS=${SP_DIR}/numpy/_core/include" fi PG_CONFIG="$(which pg_config)" @@ -30,6 +33,7 @@ time cmake ${CMAKE_ARGS} \ -D PostgreSQL_CONFIG="${PG_CONFIG}" \ -D PYTHON_EXECUTABLE="${PYTHON}" \ -D Python_EXECUTABLE="${PYTHON}" \ + -D Python3_EXECUTABLE="${PYTHON}" \ -D RDK_BUILD_AVALON_SUPPORT=ON \ -D RDK_BUILD_CAIRO_SUPPORT=ON \ -D RDK_BUILD_CPP_TESTS=OFF \ From fe919652200abd2739caea653e0acdc792b83c1e Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 03:56:28 -0400 Subject: [PATCH 13/20] Update build.sh --- recipe/build.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index b1f5dcc..90245a3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -10,17 +10,14 @@ if [ "${target_platform}" == "linux-ppc64le" ] || [ "${target_platform}" == "lin fi # Numpy cannot be found in ppc64le for some reason... some extra help will do ;) +# "core" for np v1; "_core" for v2. EXTRA_CMAKE_FLAGS="" if [[ "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then - EXTRA_CMAKE_FLAGS+=" -D PYTHON_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/_core/include" - EXTRA_CMAKE_FLAGS+=" -D PYTHON3_NUMPY_INCLUDE_PATH=${SP_DIR}/numpy/_core/include" - EXTRA_CMAKE_FLAGS+=" -D Python_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" - EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIRS=${SP_DIR}/numpy/_core/include" fi PG_CONFIG="$(which pg_config)" -if [ "${target_platform}" == "osx-arm64" ]; then +if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then # See https://github.com/conda-forge/pgvector-feedstock/blob/main/recipe/build.sh. chmod +x "${RECIPE_DIR}/arm64_pg_config" PG_CONFIG="${RECIPE_DIR}/arm64_pg_config" @@ -31,8 +28,6 @@ time cmake ${CMAKE_ARGS} \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_PREFIX="${PREFIX}" \ -D PostgreSQL_CONFIG="${PG_CONFIG}" \ - -D PYTHON_EXECUTABLE="${PYTHON}" \ - -D Python_EXECUTABLE="${PYTHON}" \ -D Python3_EXECUTABLE="${PYTHON}" \ -D RDK_BUILD_AVALON_SUPPORT=ON \ -D RDK_BUILD_CAIRO_SUPPORT=ON \ From 554dabb5e003a5c0506e207c3011c52507ba4577 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 03:57:23 -0400 Subject: [PATCH 14/20] Update meta.yaml --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6357614..2858b5e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ requirements: - numpy # [build_platform != target_platform] - postgresql # [build_platform != target_platform] - python # [build_platform != target_platform] - - cmake 3.29 + - cmake - jom # [win] - make # [unix] - pkg-config @@ -61,7 +61,7 @@ outputs: build: - {{ compiler("cxx") }} - {{ stdlib("c") }} - - cmake 3.29 + - cmake host: - cairo - freetype @@ -82,7 +82,7 @@ outputs: requirements: build: - {{ stdlib("c") }} - - cmake 3.29 + - cmake run: - {{ pin_subpackage('librdkit', exact=True) }} test: @@ -104,7 +104,7 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - python # [build_platform != target_platform] - - cmake 3.29 + - cmake - jom # [win] - make # [unix] - pkg-config @@ -203,7 +203,7 @@ outputs: - {{ compiler('cxx') }} - {{ stdlib("c") }} - postgresql # [build_platform != target_platform] - - cmake 3.29 + - cmake host: - {{ pin_subpackage('librdkit', exact=True) }} - cairo From c7fcf4fa60545a266072f6bcf183ebae5b3ae81f Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Thu, 3 Oct 2024 10:44:07 -0400 Subject: [PATCH 15/20] Update meta.yaml --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2858b5e..3ba8626 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,8 +18,7 @@ source: - rdkit-postgresql-osx.patch build: - number: 1 - #skip: true # [aarch64] + number: 2 requirements: # See https://conda-forge.org/docs/maintainer/knowledge_base/#placing-requirements-in-build-or-host and @@ -196,6 +195,8 @@ outputs: license_file: license.txt - name: rdkit-postgresql + build: + skip: true # [aarch64 or ppc64le] script: install.sh # [unix] script: install.bat # [win] requirements: From 54cab0f0cf8a275c290e202763227b452e483397 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:48:55 +0000 Subject: [PATCH 16/20] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and conda-forge-pinning 2024.10.03.06.07.11 --- .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2python3.13.____cp313.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2python3.13.____cp313.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2python3.13.____cp313.yaml | 2 ++ 30 files changed, 60 insertions(+) diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index b222277..7bc59fd 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 1d509a6..cdedda6 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 3f1c07c..43238f6 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index 12c60f1..4d85323 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml index 5f65533..6434c9c 100644 --- a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 9ac1400..5c3cccb 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 613fd09..a4fa7a4 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 418d141..4d19ac5 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 5cce715..8e80a37 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index ace17eb..61a7c99 100644 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 40200d4..8156fc9 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 1954870..babef45 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index f2fea9c..a3c5e80 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 7454883..d04bb3a 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index e3d7345..f0877fc 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - sysroot c_stdlib_version: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 2296371..151c18c 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 6d1df4b..952aed4 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 408c570..f40e8b8 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 3fa1ba5..2923873 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml index 756882c..245372c 100644 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index f7563c1..cdbf352 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index b14e106..b98caaf 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 41c1d31..e4c8662 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 554831b..733bd6b 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 6821713..24eb711 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +ace: +- 8.0.1 c_stdlib: - macosx_deployment_target c_stdlib_version: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index e922779..ba75c44 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - vs cairo: diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index c2b5127..2595a6d 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - vs cairo: diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 2b00966..38bd2e1 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - vs cairo: diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 557e784..c56d60e 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - vs cairo: diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml index 2245541..d6c4b57 100644 --- a/.ci_support/win_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -1,3 +1,5 @@ +ace: +- 8.0.1 c_stdlib: - vs cairo: From a0e1a6ae1f4bb28adf3f27b63fedceea8311936d Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Fri, 4 Oct 2024 14:38:39 -0400 Subject: [PATCH 17/20] Update recipe/build.sh Co-authored-by: Mark Harfouche --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 90245a3..249539f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,7 +13,7 @@ fi # "core" for np v1; "_core" for v2. EXTRA_CMAKE_FLAGS="" if [[ "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then - EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=${SP_DIR}/numpy/_core/include" + EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())'" fi PG_CONFIG="$(which pg_config)" From 54c96871012768c8efcf3e4acebf9ee278676568 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Fri, 4 Oct 2024 14:38:55 -0400 Subject: [PATCH 18/20] Update recipe/build.sh Co-authored-by: Mark Harfouche --- recipe/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 249539f..394dc7a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,8 +9,6 @@ if [ "${target_platform}" == "linux-ppc64le" ] || [ "${target_platform}" == "lin POPCNT_OPTIMIZATION="OFF" fi -# Numpy cannot be found in ppc64le for some reason... some extra help will do ;) -# "core" for np v1; "_core" for v2. EXTRA_CMAKE_FLAGS="" if [[ "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())'" From 6e3b0214325c19a860b034fed529b31ebb6d37b2 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Fri, 4 Oct 2024 14:41:16 -0400 Subject: [PATCH 19/20] Update build.sh --- recipe/build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 394dc7a..72bee3a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,10 +9,8 @@ if [ "${target_platform}" == "linux-ppc64le" ] || [ "${target_platform}" == "lin POPCNT_OPTIMIZATION="OFF" fi -EXTRA_CMAKE_FLAGS="" -if [[ "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then - EXTRA_CMAKE_FLAGS+=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())'" -fi +EXTRA_CMAKE_FLAGS=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())'" + PG_CONFIG="$(which pg_config)" if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then From 3f5c9944050503ee5d346c6f3ad35e0c90567b2c Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Fri, 4 Oct 2024 14:53:53 -0400 Subject: [PATCH 20/20] Update recipe/build.sh Co-authored-by: Mark Harfouche --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 72bee3a..499144f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,7 +9,7 @@ if [ "${target_platform}" == "linux-ppc64le" ] || [ "${target_platform}" == "lin POPCNT_OPTIMIZATION="OFF" fi -EXTRA_CMAKE_FLAGS=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())'" +EXTRA_CMAKE_FLAGS=" -D Python3_NumPy_INCLUDE_DIR=$(python -c 'import numpy as np; print(np.get_include())')" PG_CONFIG="$(which pg_config)"