diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 1532c71f..7ecb37bb 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index a3e88d1c..f2d4e6b4 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 0873d533..c26adec8 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index ff348ec5..d2cd7e7e 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml index e0058ae6..65c83f77 100644 --- a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 5ca05307..cf546831 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index e46b986e..b9021300 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 69de09dc..86099ad0 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index c65db12e..ab27f357 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index 1d4156dc..58041089 100644 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 257d7fcc..25b30c8e 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index ac4cfbd4..4ff20213 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 373e2437..3fbc56a5 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 3b4fd439..45cef605 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index b7ede437..873e2045 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -76,8 +78,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 18feb5e0..d6432a6b 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 6f43e92a..aad07406 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 96e70e38..e99fbf4f 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index b075b7e9..09cf39cd 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml index 789ed2d3..3ee05e62 100644 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 4a810ff9..a5550865 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index bb40c0be..f780b196 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 042cd976..6b185910 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index fc9c8746..072c3c9e 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 57694a76..0a87cad3 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -42,6 +42,8 @@ libblas: - 3.9.* *netlib libcblas: - 3.9.* *netlib +liblzma_devel: +- '5' libpng: - '1.6' librsvg: @@ -78,8 +80,6 @@ tbb_devel: - '2021' xrootd: - '5' -xz: -- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.gitignore b/.gitignore index 179afe55..bb385366 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f960bbed..bb08a6ae 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -64,9 +64,6 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEB EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -# build portion of https://github.com/conda-forge/conda-smithy/issues/2057 -EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --experimental" - ( endgroup "Configuring conda" ) 2> /dev/null if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d7ea44aa..dd15f4da 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -33,9 +33,6 @@ echo "Cleaning up micromamba" rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true ( endgroup "Provisioning base env with micromamba" ) 2> /dev/null -# build portion of https://github.com/conda-forge/conda-smithy/issues/2057 -EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --experimental" - ( startgroup "Configuring conda" ) 2> /dev/null echo "Activating environment" source "${MINIFORGE_HOME}/etc/profile.d/conda.sh"