diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 5d8853c5..79030d57 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml index 04842e83..a40d9e27 100644 --- a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml index 57a2c6ad..ce3666d0 100644 --- a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml index cc80068c..5e9be5de 100644 --- a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml index c7169e95..f6dc32c6 100644 --- a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml index 712d2290..47fd2ed6 100644 --- a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml index f0a1725f..f8ba183c 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml index ba2ad403..1182b838 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml index 58ed24b7..6ab083de 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml index db3d89de..eb89e0a7 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml index 4c5c958b..24f2bd5f 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml index 36e6eabc..7e073283 100644 --- a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml index d6273bfb..60103140 100644 --- a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml index 33f46886..68ed4a18 100644 --- a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml index 16fd5a0e..3095c8a8 100644 --- a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml index 485a6cda..5d22cfe5 100644 --- a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -69,7 +71,9 @@ tk: vtk: - 9.2.6 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 38df4016..1153356f 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -2,6 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -68,5 +70,8 @@ tk: - '8.6' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index bdf30db5..e39c5501 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -2,6 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -68,5 +70,8 @@ tk: - '8.6' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index b23cc18d..849ea71a 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -2,6 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -68,5 +70,8 @@ tk: - '8.6' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 7c78d9b3..ebb38da5 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -2,6 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -68,5 +70,8 @@ tk: - '8.6' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index d80cf6a4..2c23303a 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -2,6 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -38,8 +42,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -68,5 +70,8 @@ tk: - '8.6' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 342c60f2..ff870b4c 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -34,8 +38,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -60,5 +62,8 @@ tbb_devel: - '2021' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 6fecf35b..abe84c60 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -34,8 +38,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -60,5 +62,8 @@ tbb_devel: - '2021' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index e061d27e..6adf39b6 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -34,8 +38,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -60,5 +62,8 @@ tbb_devel: - '2021' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index eb04ea16..c113d73d 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -34,8 +38,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -60,5 +62,8 @@ tbb_devel: - '2021' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 2de4806b..cc48f683 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,5 +1,9 @@ build_variant: - qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -34,8 +38,6 @@ libtiff: - '4.6' libuuid: - '2' -libxcb: -- '1.15' libxml2: - '2' lz4_c: @@ -60,5 +62,8 @@ tbb_devel: - '2021' vtk: - 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name zlib: -- '1.2' +- '1' 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/libxcb115.yaml b/.ci_support/migrations/libxcb115.yaml deleted file mode 100644 index 47a46f97..00000000 --- a/.ci_support/migrations/libxcb115.yaml +++ /dev/null @@ -1,9 +0,0 @@ -migrator_ts: 1684619068 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - -# Remember to add to global pinnings -libxcb: - - '1.15' 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/migrations/python312.yaml b/.ci_support/migrations/python312.yaml index b39b1bb1..d71f6f16 100644 --- a/.ci_support/migrations/python312.yaml +++ b/.ci_support/migrations/python312.yaml @@ -1,33 +1,33 @@ migrator_ts: 1695046563 __migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 5 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false python: - 3.12.* *_cpython diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index aa7d6af2..e8f1ff7b 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 7636b6b0..6944de9b 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 7c7373e4..f0b2ce51 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 8e9d1516..015534c1 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 19b3e649..43e3ff4c 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 49f1cf3e..f1f8a23e 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 24911ddd..45ac4ca0 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index dc077c26..b830d18b 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index de4b4174..e87c5625 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 29e8c42f..2fc7d9d3 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,7 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_variant: - qt +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -9,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' ffmpeg: @@ -61,4 +67,4 @@ tk: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 1bcb054f..5a32e1a6 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ build_variant: - qt +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -53,4 +55,4 @@ tbb_devel: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index f87b0a14..c4491ca3 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ build_variant: - qt +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -53,4 +55,4 @@ tbb_devel: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 46333f20..e3cdc003 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ build_variant: - qt +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -53,4 +55,4 @@ tbb_devel: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index ebc6638d..6cff077c 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -1,5 +1,7 @@ build_variant: - qt +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -53,4 +55,4 @@ tbb_devel: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 10610009..9a1d3278 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ build_variant: - qt +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -53,4 +55,4 @@ tbb_devel: vtk: - 9.2.6 zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/conda-forge.yml b/conda-forge.yml index 4a6ba4a4..c265449b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,4 +8,6 @@ conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main +os_version: + linux_64: cos7 test: native_and_emulated diff --git a/recipe/build-base.sh b/recipe/build-base.sh index d987e1af..d9515ebd 100755 --- a/recipe/build-base.sh +++ b/recipe/build-base.sh @@ -75,6 +75,12 @@ if [[ "$target_platform" != "linux-ppc64le" ) fi +if [[ "$target_platform" == osx-* ]]; then + # incompatible function pointers become errors in clang >=16 + export CFLAGS="${CFLAGS} -Wno-incompatible-pointer-types" + export CXXFLAGS="${CXXFLAGS} -Wno-incompatible-pointer-types" +fi + if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then ( mkdir build-native diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index ee0e181c..5d418d61 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,3 @@ -# clang 16 errors on incompatible function pointers -c_compiler_version: # [osx] - - 15 # [osx] -cxx_compiler_version: # [osx] - - 15 # [osx] build_variant: - "qt" - "osmesa" # [linux64] @@ -19,11 +14,3 @@ replacements: - '*.cmake' regex_re: '([^;\s"]+/MacOSX\d*\.?\d*\.sdk)' replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' -cudnn: # [linux64] - - undefined # [linux64] -cuda_compiler_version: # [linux64] - - None # [linux64] -docker_image: # [linux64] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64] -cdt_name: # [linux64] - - cos7 # [linux64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e14992ee..3ebe68ab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.2.6" %} -{% set build = 21 %} +{% set build = 22 %} {% set minor_version = ".".join(version.split(".")[:2]) %} @@ -54,7 +54,7 @@ outputs: build: - {{ compiler("cxx") }} - {{ compiler('fortran') }} # [build_variant != "qt"] - - sysroot_linux-64 2.17 # [build_variant == "osmesa"] + - {{ stdlib("c") }} - cmake - ninja - python # [build_platform != target_platform]