From 36a86fc3e461fae645aa8cf5c5b24999328a5f2a 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 12:31:58 +0000 Subject: [PATCH 1/2] Rebuild for proj 9.4.0 --- .ci_support/migrations/proj940.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/proj940.yaml diff --git a/.ci_support/migrations/proj940.yaml b/.ci_support/migrations/proj940.yaml new file mode 100644 index 00000000..086f7445 --- /dev/null +++ b/.ci_support/migrations/proj940.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for proj 9.4.0 + kind: version + migration_number: 1 +migrator_ts: 1710853118.5892742 +proj: +- 9.4.0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5304ec7a..409654dc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.2.6" %} -{% set build = 20 %} +{% set build = 21 %} {% set minor_version = ".".join(version.split(".")[:2]) %} From 4fbabb48277825f052aa2306a6ba7bd83f81c808 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 12:33:04 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and conda-forge-pinning 2024.03.22.12.22.15 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + ...uild_varianteglpython3.10.____cpython.yaml | 4 +-- ...uild_varianteglpython3.11.____cpython.yaml | 4 +-- ...uild_varianteglpython3.12.____cpython.yaml | 4 +-- ...build_varianteglpython3.8.____cpython.yaml | 4 +-- ...build_varianteglpython3.9.____cpython.yaml | 4 +-- ...d_variantosmesapython3.10.____cpython.yaml | 4 +-- ...d_variantosmesapython3.11.____cpython.yaml | 4 +-- ...d_variantosmesapython3.12.____cpython.yaml | 4 +-- ...ld_variantosmesapython3.8.____cpython.yaml | 4 +-- ...ld_variantosmesapython3.9.____cpython.yaml | 4 +-- ...build_variantqtpython3.10.____cpython.yaml | 4 +-- ...build_variantqtpython3.11.____cpython.yaml | 4 +-- ...build_variantqtpython3.12.____cpython.yaml | 4 +-- ..._build_variantqtpython3.8.____cpython.yaml | 4 +-- ..._build_variantqtpython3.9.____cpython.yaml | 4 +-- .../linux_aarch64_python3.10.____cpython.yaml | 4 +-- .../linux_aarch64_python3.11.____cpython.yaml | 4 +-- .../linux_aarch64_python3.12.____cpython.yaml | 4 +-- .../linux_aarch64_python3.8.____cpython.yaml | 4 +-- .../linux_aarch64_python3.9.____cpython.yaml | 4 +-- .../linux_ppc64le_python3.10.____cpython.yaml | 4 +-- .../linux_ppc64le_python3.11.____cpython.yaml | 4 +-- .../linux_ppc64le_python3.12.____cpython.yaml | 4 +-- .../linux_ppc64le_python3.8.____cpython.yaml | 4 +-- .../linux_ppc64le_python3.9.____cpython.yaml | 4 +-- .../migrations/boost_cpp_to_libboost.yaml | 20 --------------- .ci_support/migrations/ffmpeg6.yaml | 8 ------ .ci_support/migrations/hdf51142.yaml | 7 ------ .ci_support/migrations/libjpeg_turbo3.yaml | 7 ------ .ci_support/migrations/libtiff46.yaml | 7 ------ .ci_support/migrations/proj931.yaml | 7 ------ .ci_support/migrations/pugixml114.yaml | 7 ------ .../osx_64_python3.10.____cpython.yaml | 4 +-- .../osx_64_python3.11.____cpython.yaml | 4 +-- .../osx_64_python3.12.____cpython.yaml | 4 +-- .ci_support/osx_64_python3.8.____cpython.yaml | 4 +-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 +-- .../osx_arm64_python3.10.____cpython.yaml | 4 +-- .../osx_arm64_python3.11.____cpython.yaml | 4 +-- .../osx_arm64_python3.12.____cpython.yaml | 4 +-- .../osx_arm64_python3.8.____cpython.yaml | 4 +-- .../osx_arm64_python3.9.____cpython.yaml | 4 +-- .../win_64_python3.10.____cpython.yaml | 4 +-- .../win_64_python3.11.____cpython.yaml | 4 +-- .../win_64_python3.12.____cpython.yaml | 4 +-- .ci_support/win_64_python3.8.____cpython.yaml | 4 +-- .ci_support/win_64_python3.9.____cpython.yaml | 4 +-- .gitignore | 25 +++++++++++++++++-- .scripts/build_steps.sh | 12 +++------ .scripts/run_docker_build.sh | 6 +++++ .scripts/run_osx_build.sh | 6 ++--- .scripts/run_win_build.bat | 4 +-- azure-pipelines.yml | 4 +-- build-locally.py | 5 ++-- 56 files changed, 124 insertions(+), 163 deletions(-) delete mode 100644 .ci_support/migrations/boost_cpp_to_libboost.yaml delete mode 100644 .ci_support/migrations/ffmpeg6.yaml delete mode 100644 .ci_support/migrations/hdf51142.yaml delete mode 100644 .ci_support/migrations/libjpeg_turbo3.yaml delete mode 100644 .ci_support/migrations/libtiff46.yaml delete mode 100644 .ci_support/migrations/proj931.yaml delete mode 100644 .ci_support/migrations/pugixml114.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 02655a6b..cc00751e 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -109,6 +109,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 80a146e5..5d8853c5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -39,6 +39,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_64_build_varianteglpython3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml index b7b213c0..fc0040a4 100644 --- a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml index 7f30d3a7..26b247f4 100644 --- a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml index 9d617e40..5d2955a1 100644 --- a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml index ddd5d20b..a4ff1ecb 100644 --- a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml index 016a83b4..d7ed73ee 100644 --- a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml index 8047f904..c9ad2b54 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml index d7a34b61..7fd498d3 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml index 41b2ad37..140005e8 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml index cdb7c5b9..b10c5fb0 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml index 0e48b280..ff53fafc 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml index e76f2773..cd9087d5 100644 --- a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml index ef937afd..cd3834fa 100644 --- a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml index 8604c1de..5ac9b941 100644 --- a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml index aafc15b6..29b9e479 100644 --- a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml index a4502e16..458d3f47 100644 --- a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index f2b75999..403dc51b 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 24128938..8152e1b8 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 879352e5..32535a5a 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 1944b2c6..d2ee0ca1 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index bc8f7393..2c4b4ef7 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -49,7 +49,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 9c82ef59..21f6a32e 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -37,7 +37,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -45,7 +45,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index fb1bfbbf..18f6827c 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -37,7 +37,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -45,7 +45,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index f4880ee9..79c5148e 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -37,7 +37,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -45,7 +45,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 8e60e68b..0181d6c3 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -37,7 +37,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -45,7 +45,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 63542960..7d0b97c8 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -37,7 +37,7 @@ libuuid: libxcb: - '1.15' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -45,7 +45,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/migrations/boost_cpp_to_libboost.yaml b/.ci_support/migrations/boost_cpp_to_libboost.yaml deleted file mode 100644 index 5e0e2c24..00000000 --- a/.ci_support/migrations/boost_cpp_to_libboost.yaml +++ /dev/null @@ -1,20 +0,0 @@ -migrator_ts: 1695775149 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - commit_message: "Rebuild for libboost 1.82" - # limit the number of prs for ramp-up - pr_limit: 10 -libboost_devel: - - 1.82 -# This migration is matched with a piggy-back migrator -# (see https://github.com/regro/cf-scripts/pull/1668) -# that will replace boost-cpp with libboost-devel -boost_cpp: - - 1.82 -# same for boost -> libboost-python-devel -libboost_python_devel: - - 1.82 -boost: - - 1.82 diff --git a/.ci_support/migrations/ffmpeg6.yaml b/.ci_support/migrations/ffmpeg6.yaml deleted file mode 100644 index 4fff8dcb..00000000 --- a/.ci_support/migrations/ffmpeg6.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -ffmpeg: -- '5' -- '6' -migrator_ts: 1684252387.6420875 diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml deleted file mode 100644 index 1517ced4..00000000 --- a/.ci_support/migrations/hdf51142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.2 -migrator_ts: 1692590899.44706 diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml deleted file mode 100644 index b4e24688..00000000 --- a/.ci_support/migrations/libjpeg_turbo3.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libjpeg_turbo: -- '3' -migrator_ts: 1693842343.429878 diff --git a/.ci_support/migrations/libtiff46.yaml b/.ci_support/migrations/libtiff46.yaml deleted file mode 100644 index 473b7bfd..00000000 --- a/.ci_support/migrations/libtiff46.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libtiff: -- '4.6' -migrator_ts: 1694631046.2977061 diff --git a/.ci_support/migrations/proj931.yaml b/.ci_support/migrations/proj931.yaml deleted file mode 100644 index 59f0a47d..00000000 --- a/.ci_support/migrations/proj931.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1701494989.7141423 -proj: -- 9.3.1 diff --git a/.ci_support/migrations/pugixml114.yaml b/.ci_support/migrations/pugixml114.yaml deleted file mode 100644 index 094b113e..00000000 --- a/.ci_support/migrations/pugixml114.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1699550050.5782259 -pugixml: -- '1.14' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index a5998d08..3d70bcd1 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 27974c03..3b5b9781 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 2a7cda1c..26215478 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index eb4e2e0a..9bdcfbfa 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 4a010c85..e12cd5ba 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 912a13b7..e1e6241d 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 3cddd0b1..d8c618e6 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index fe8008f3..cec01468 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index f54086b4..0f88ef0b 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 838a6821..678539c3 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -31,7 +31,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 macos_machine: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 288b9fc3..332af452 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -35,7 +35,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 3b3ce3d9..633b26e4 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -35,7 +35,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 3a630eeb..5897b5ef 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -35,7 +35,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 80f3e99b..48ed442d 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -35,7 +35,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 306a4461..c47340de 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libtiff: - '4.6' libxml2: -- '2.11' +- '2' lz4_c: - 1.9.3 pin_run_as_build: @@ -35,7 +35,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- 9.4.0 pugixml: - '1.14' python: diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# 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/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b928881a..9e37a3b2 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}" @@ -65,12 +65,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -82,7 +76,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_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..07dff219 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 48734de9..6d546976 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/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 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 3f4b7a79..e0d408d0 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." )