diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7f3b4c52..06716453 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -80,52 +80,28 @@ jobs: CONFIG: linux_64_numpy1.26python3.12.____cpythonqt_versionnone UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpythonqt_version6: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpythonqt_version6 + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.8.____cpythonqt_version6: - CONFIG: linux_aarch64_numpy1.22python3.8.____cpythonqt_version6 + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone: - CONFIG: linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6: - CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6 + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone: - CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpythonqt_version6: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpythonqt_version6 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpythonqt_version6: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpythonqt_version6 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpythonqt_version6: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpythonqt_version6 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.22python3.10.____cpython: @@ -152,7 +128,7 @@ jobs: CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - maxParallel: 31 + maxParallel: 28 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 94a236ab..4d96b655 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_numpy1.22python3.10.____cpython: @@ -41,7 +41,7 @@ jobs: osx_arm64_numpy1.26python3.12.____cpython: CONFIG: osx_arm64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 9 + maxParallel: 10 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 08840c8c..8efc886f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -44,7 +44,7 @@ jobs: win_64_numpy1.26python3.12.____cpythonqt_version6: CONFIG: win_64_numpy1.26python3.12.____cpythonqt_version6 UPLOAD_PACKAGES: 'True' - maxParallel: 10 + maxParallel: 11 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version5.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version5.yaml index 18598c9a..4e0c2c13 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version6.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version6.yaml index f8ed4e2e..0aef775f 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_versionnone.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_versionnone.yaml index 78702f7f..7ed723d8 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version5.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version5.yaml index 44f1c9e3..4972828b 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version6.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version6.yaml index 9c32212d..ac4cd40e 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_versionnone.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_versionnone.yaml index 3c65d8d6..30a703e5 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpythonqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version5.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version5.yaml index e6dd1faa..31c48a01 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version6.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version6.yaml index a28a0a35..41a8999b 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml index d3935172..76eac606 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version5.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version5.yaml index 9b278acf..50ce962d 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version6.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version6.yaml index ffc495c3..445dac10 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_versionnone.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_versionnone.yaml index b7cee867..bd6675f6 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version5.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version5.yaml index 46c6097b..6e9ce751 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version6.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version6.yaml index 9985e123..7b132064 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_versionnone.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_versionnone.yaml index b380fb9e..d1abca7f 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version5.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version5.yaml index 30569946..3a8725f7 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version5.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version5.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version6.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version6.yaml index 4095401a..7765c470 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version6.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_version6.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_versionnone.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_versionnone.yaml index e508a9d0..49207d70 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonqt_versionnone.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -69,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 3e853296..2730b172 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.10.* *_cpython qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_version6.yaml deleted file mode 100644 index fc6c81b2..00000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 44744ee9..f4032cf4 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.8.* *_cpython qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_version6.yaml deleted file mode 100644 index aac0e9bf..00000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 861b8978..92015be0 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.9.* *_73_pypy qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6.yaml deleted file mode 100644 index a1a58d41..00000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index ef28a7b0..162aa89b 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.9.* *_cpython qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_version6.yaml deleted file mode 100644 index d127c751..00000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index dd29ca75..51fd4d19 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.11.* *_cpython qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_version6.yaml deleted file mode 100644 index 8273fd4b..00000000 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.23' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml similarity index 91% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone.yaml rename to .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index a17b676e..8fe3c3f7 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -62,8 +66,6 @@ python: - 3.12.* *_cpython qt: - '5.15' -qt6_main: -- '6.6' qt_version: - none target_platform: @@ -71,6 +73,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_version6.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_version6.yaml deleted file mode 100644 index b3dfcb4d..00000000 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonqt_version6.yaml +++ /dev/null @@ -1,77 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -freetype: -- '2' -glib: -- '2' -harfbuzz: -- '8' -hdf5: -- 1.14.3 -jasper: -- '4' -libcblas: -- 3.9 *netlib -libiconv: -- '1' -libjpeg_turbo: -- '3' -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -libopenvino_dev: -- 2024.0.0 -libpng: -- '1.6' -libprotobuf: -- 4.25.3 -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.26' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -qt: -- '5.15' -qt6_main: -- '6.6' -qt_version: -- '6' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index fc81fddb..16f1e7c7 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 715d0f77..9fa0db22 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index f952fbc9..aa568152 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 1812a3a8..bedb0420 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 5d65a48e..c440a746 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index d891feac..432d5275 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -63,6 +67,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy zlib: diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml deleted file mode 100644 index 3781ea0c..00000000 --- a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml +++ /dev/null @@ -1,13 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libabseil: -- 20230802 -libgrpc: -- "1.57" -libprotobuf: -- 4.23.4 -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1692632590.658328 diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml deleted file mode 100644 index 08cd5a02..00000000 --- a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml +++ /dev/null @@ -1,22 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - # this shouldn't attempt to modify the python feedstocks - - protobuf -libabseil: -- "20240116" -libgrpc: -- "1.61" -libprotobuf: -- 4.25.2 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1705991934.9119136 diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml deleted file mode 100644 index 16b401a5..00000000 --- a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml +++ /dev/null @@ -1,23 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.3 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf -libgrpc: -- "1.62" -libprotobuf: -- 4.25.3 -# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; -# this ensures that this migration applies also without the previous one -libabseil: -- "20240116" -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1709522594.9193177 diff --git a/.ci_support/migrations/libopenvino_dev2024.yaml b/.ci_support/migrations/libopenvino_dev2024.yaml deleted file mode 100644 index 2a612adf..00000000 --- a/.ci_support/migrations/libopenvino_dev2024.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libopenvino_dev 2024 - kind: version - migration_number: 1 -libopenvino_dev: -- '2024.0.0' -migrator_ts: 1709737468.367106 diff --git a/.ci_support/migrations/openvino202410.yaml b/.ci_support/migrations/openvino202410.yaml new file mode 100644 index 00000000..399003f9 --- /dev/null +++ b/.ci_support/migrations/openvino202410.yaml @@ -0,0 +1,7 @@ +migrator_ts: 1712592149 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 +libopenvino_dev: + - 2024.1.0 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index e8255f7e..33e11886 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 4a43a6fd..35186809 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 75f07dfd..571865cf 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index eb43f2b1..462b27c2 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 6655e2ee..c6e8705d 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index f68a74ca..55bb6806 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index cc565058..d49e3c8d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index afeaefb7..b7bf1b73 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index cb789ee8..22e3b9e9 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 15f5285c..085d8819 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 356fd640..d463ef2f 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version5.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version5.yaml index a13feef7..364c12d5 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version5.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version6.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version6.yaml index 92db0eee..beaca91c 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version6.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version5.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version5.yaml index 9ffbd93f..07a85d4f 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version5.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version6.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version6.yaml index 8bd2880d..89702919 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version6.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpythonqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version5.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version5.yaml index 2d54e07d..ab9d69c3 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version5.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version6.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version6.yaml index d50f35ac..08bf457f 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version6.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypyqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version5.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version5.yaml index 806c2fe3..6a743401 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version5.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version6.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version6.yaml index 4937a6a3..a59d514b 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version6.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version5.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version5.yaml index ec7b9c7d..965b245d 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version5.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version6.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version6.yaml index 4749b4f0..143d5cab 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version6.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpythonqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version5.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version5.yaml index 3fbd5d8e..493ac786 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version5.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version5.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version6.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version6.yaml index 4659b911..67eb272a 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version6.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpythonqt_version6.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/README.md b/README.md index 7dbea5ad..dc0db1ee 100644 --- a/README.md +++ b/README.md @@ -157,87 +157,45 @@ Current build status - linux_aarch64_numpy1.22python3.10.____cpythonqt_version6 + linux_aarch64_numpy1.22python3.10.____cpython - variant + variant - linux_aarch64_numpy1.22python3.10.____cpythonqt_versionnone + linux_aarch64_numpy1.22python3.8.____cpython - variant + variant - linux_aarch64_numpy1.22python3.8.____cpythonqt_version6 + linux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant - linux_aarch64_numpy1.22python3.8.____cpythonqt_versionnone + linux_aarch64_numpy1.22python3.9.____cpython - variant + variant - linux_aarch64_numpy1.22python3.9.____73_pypyqt_version6 + linux_aarch64_numpy1.23python3.11.____cpython - variant + variant - linux_aarch64_numpy1.22python3.9.____73_pypyqt_versionnone + linux_aarch64_numpy1.26python3.12.____cpython - variant - - - - linux_aarch64_numpy1.22python3.9.____cpythonqt_version6 - - - variant - - - - linux_aarch64_numpy1.22python3.9.____cpythonqt_versionnone - - - variant - - - - linux_aarch64_numpy1.23python3.11.____cpythonqt_version6 - - - variant - - - - linux_aarch64_numpy1.23python3.11.____cpythonqt_versionnone - - - variant - - - - linux_aarch64_numpy1.26python3.12.____cpythonqt_version6 - - - variant - - - - linux_aarch64_numpy1.26python3.12.____cpythonqt_versionnone - - - variant + variant diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 6303092a..6c81ef59 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,10 +1,10 @@ MACOSX_SDK_VERSION: # [osx and x86_64 and qt_version!=6] - "10.13" # [osx and x86_64 and qt_version!=6] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64 and qt_version!=6] +c_stdlib_version: # [osx and x86_64 and qt_version!=6] - "10.13" # [osx and x86_64 and qt_version!=6] # https://doc.qt.io/qt-6/macos.html -MACOSX_DEPLOYMENT_TARGET: # [osx and qt_version == 6] +c_stdlib_version: # [osx and qt_version == 6] - '11.0' # [osx and qt_version == 6] MACOSX_SDK_VERSION: # [osx and qt_version == 6] - '12.3' # [osx and qt_version == 6] @@ -12,7 +12,12 @@ MACOSX_SDK_VERSION: # [osx and qt_version == 6] # As of 2024/03 -- OSX basically never had qt builds. If somebody asks, we can build them # As of 2024/03 -- qt6 works better than qt5 on aarch64. So drop qt5. # As of 2024/03 -- No windows users have expressed concerns about the qt libraries. don't build None +# As of 2024/05 -- We had trouble gettin the aarch64 builds to work well with Qt6 and import cv2 on the CIs. +# We can re-consider adding Qt6 support for Aarch upon request. qt_version: - none # [not win] - 5 # [not (ppc64le or aarch64 or osx)] - - 6 # [not (ppc64le or osx)] + - 6 # [not (ppc64le or aarch64 or osx)] + +c_stdlib_version: # [linux] + - "2.17" # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5a81d904..755e4473 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ {% set PY_VER_MAJOR = PY_VER.split('.')[0] %} {% set PY_VER_MINOR = PY_VER.split('.')[1] %} -{% set build = 12 %} +{% set build = 13 %} # Allow the qt version to be easily read from the build number 100's value. @@ -91,8 +91,8 @@ requirements: # ICE when enabling this # - llvm-openmp # [osx] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - - sysroot_linux-64 2.17 # [linux64] - {{ cdt('mesa-libgl-devel') }} # [linux] - {{ cdt('mesa-libegl-devel') }} # [linux] - {{ cdt('mesa-dri-drivers') }} # [linux]