diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cc00751e..714682b5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,106 +8,207 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_build_varianteglpython3.10.____cpython: - CONFIG: linux_64_build_varianteglpython3.10.____cpython + linux_64_build_varianteglffmpeg6python3.10.____cpython: + CONFIG: linux_64_build_varianteglffmpeg6python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglpython3.11.____cpython: - CONFIG: linux_64_build_varianteglpython3.11.____cpython + linux_64_build_varianteglffmpeg6python3.11.____cpython: + CONFIG: linux_64_build_varianteglffmpeg6python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglpython3.12.____cpython: - CONFIG: linux_64_build_varianteglpython3.12.____cpython + linux_64_build_varianteglffmpeg6python3.12.____cpython: + CONFIG: linux_64_build_varianteglffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglpython3.8.____cpython: - CONFIG: linux_64_build_varianteglpython3.8.____cpython + linux_64_build_varianteglffmpeg6python3.8.____cpython: + CONFIG: linux_64_build_varianteglffmpeg6python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglpython3.9.____cpython: - CONFIG: linux_64_build_varianteglpython3.9.____cpython + linux_64_build_varianteglffmpeg6python3.9.____cpython: + CONFIG: linux_64_build_varianteglffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesapython3.10.____cpython: - CONFIG: linux_64_build_variantosmesapython3.10.____cpython + linux_64_build_varianteglffmpeg7python3.10.____cpython: + CONFIG: linux_64_build_varianteglffmpeg7python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesapython3.11.____cpython: - CONFIG: linux_64_build_variantosmesapython3.11.____cpython + linux_64_build_varianteglffmpeg7python3.11.____cpython: + CONFIG: linux_64_build_varianteglffmpeg7python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesapython3.12.____cpython: - CONFIG: linux_64_build_variantosmesapython3.12.____cpython + linux_64_build_varianteglffmpeg7python3.12.____cpython: + CONFIG: linux_64_build_varianteglffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesapython3.8.____cpython: - CONFIG: linux_64_build_variantosmesapython3.8.____cpython + linux_64_build_varianteglffmpeg7python3.8.____cpython: + CONFIG: linux_64_build_varianteglffmpeg7python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesapython3.9.____cpython: - CONFIG: linux_64_build_variantosmesapython3.9.____cpython + linux_64_build_varianteglffmpeg7python3.9.____cpython: + CONFIG: linux_64_build_varianteglffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtpython3.10.____cpython: - CONFIG: linux_64_build_variantqtpython3.10.____cpython + linux_64_build_variantosmesaffmpeg6python3.10.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg6python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtpython3.11.____cpython: - CONFIG: linux_64_build_variantqtpython3.11.____cpython + linux_64_build_variantosmesaffmpeg6python3.11.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg6python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtpython3.12.____cpython: - CONFIG: linux_64_build_variantqtpython3.12.____cpython + linux_64_build_variantosmesaffmpeg6python3.12.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtpython3.8.____cpython: - CONFIG: linux_64_build_variantqtpython3.8.____cpython + linux_64_build_variantosmesaffmpeg6python3.8.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg6python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtpython3.9.____cpython: - CONFIG: linux_64_build_variantqtpython3.9.____cpython + linux_64_build_variantosmesaffmpeg6python3.9.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython + linux_64_build_variantosmesaffmpeg7python3.10.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg7python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.11.____cpython: - CONFIG: linux_aarch64_python3.11.____cpython + linux_64_build_variantosmesaffmpeg7python3.11.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg7python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.12.____cpython: - CONFIG: linux_aarch64_python3.12.____cpython + linux_64_build_variantosmesaffmpeg7python3.12.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython + linux_64_build_variantosmesaffmpeg7python3.8.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg7python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython + linux_64_build_variantosmesaffmpeg7python3.9.____cpython: + CONFIG: linux_64_build_variantosmesaffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.10.____cpython: - CONFIG: linux_ppc64le_python3.10.____cpython + linux_64_build_variantqtffmpeg6python3.10.____cpython: + CONFIG: linux_64_build_variantqtffmpeg6python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.11.____cpython: - CONFIG: linux_ppc64le_python3.11.____cpython + linux_64_build_variantqtffmpeg6python3.11.____cpython: + CONFIG: linux_64_build_variantqtffmpeg6python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.12.____cpython: - CONFIG: linux_ppc64le_python3.12.____cpython + linux_64_build_variantqtffmpeg6python3.12.____cpython: + CONFIG: linux_64_build_variantqtffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython + linux_64_build_variantqtffmpeg6python3.8.____cpython: + CONFIG: linux_64_build_variantqtffmpeg6python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython + linux_64_build_variantqtffmpeg6python3.9.____cpython: + CONFIG: linux_64_build_variantqtffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtffmpeg7python3.10.____cpython: + CONFIG: linux_64_build_variantqtffmpeg7python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtffmpeg7python3.11.____cpython: + CONFIG: linux_64_build_variantqtffmpeg7python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtffmpeg7python3.12.____cpython: + CONFIG: linux_64_build_variantqtffmpeg7python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtffmpeg7python3.8.____cpython: + CONFIG: linux_64_build_variantqtffmpeg7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtffmpeg7python3.9.____cpython: + CONFIG: linux_64_build_variantqtffmpeg7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg6python3.10.____cpython: + CONFIG: linux_aarch64_ffmpeg6python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg6python3.11.____cpython: + CONFIG: linux_aarch64_ffmpeg6python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg6python3.12.____cpython: + CONFIG: linux_aarch64_ffmpeg6python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg6python3.8.____cpython: + CONFIG: linux_aarch64_ffmpeg6python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg6python3.9.____cpython: + CONFIG: linux_aarch64_ffmpeg6python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg7python3.10.____cpython: + CONFIG: linux_aarch64_ffmpeg7python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg7python3.11.____cpython: + CONFIG: linux_aarch64_ffmpeg7python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg7python3.12.____cpython: + CONFIG: linux_aarch64_ffmpeg7python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg7python3.8.____cpython: + CONFIG: linux_aarch64_ffmpeg7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_ffmpeg7python3.9.____cpython: + CONFIG: linux_aarch64_ffmpeg7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg6python3.10.____cpython: + CONFIG: linux_ppc64le_ffmpeg6python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg6python3.11.____cpython: + CONFIG: linux_ppc64le_ffmpeg6python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg6python3.12.____cpython: + CONFIG: linux_ppc64le_ffmpeg6python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg6python3.8.____cpython: + CONFIG: linux_ppc64le_ffmpeg6python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg6python3.9.____cpython: + CONFIG: linux_ppc64le_ffmpeg6python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg7python3.10.____cpython: + CONFIG: linux_ppc64le_ffmpeg7python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg7python3.11.____cpython: + CONFIG: linux_ppc64le_ffmpeg7python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg7python3.12.____cpython: + CONFIG: linux_ppc64le_ffmpeg7python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg7python3.8.____cpython: + CONFIG: linux_ppc64le_ffmpeg7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_ffmpeg7python3.9.____cpython: + CONFIG: linux_ppc64le_ffmpeg7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + maxParallel: 31 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 79030d57..9804c1b9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,36 +8,67 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_ffmpeg6python3.10.____cpython: + CONFIG: osx_64_ffmpeg6python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + osx_64_ffmpeg6python3.11.____cpython: + CONFIG: osx_64_ffmpeg6python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.12.____cpython: - CONFIG: osx_64_python3.12.____cpython + osx_64_ffmpeg6python3.12.____cpython: + CONFIG: osx_64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_ffmpeg6python3.8.____cpython: + CONFIG: osx_64_ffmpeg6python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_ffmpeg6python3.9.____cpython: + CONFIG: osx_64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_64_ffmpeg7python3.10.____cpython: + CONFIG: osx_64_ffmpeg7python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython + osx_64_ffmpeg7python3.11.____cpython: + CONFIG: osx_64_ffmpeg7python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.12.____cpython: - CONFIG: osx_arm64_python3.12.____cpython + osx_64_ffmpeg7python3.12.____cpython: + CONFIG: osx_64_ffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_64_ffmpeg7python3.8.____cpython: + CONFIG: osx_64_ffmpeg7python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_64_ffmpeg7python3.9.____cpython: + CONFIG: osx_64_ffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg6python3.10.____cpython: + CONFIG: osx_arm64_ffmpeg6python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg6python3.11.____cpython: + CONFIG: osx_arm64_ffmpeg6python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg6python3.12.____cpython: + CONFIG: osx_arm64_ffmpeg6python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg6python3.8.____cpython: + CONFIG: osx_arm64_ffmpeg6python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg6python3.9.____cpython: + CONFIG: osx_arm64_ffmpeg6python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg7python3.10.____cpython: + CONFIG: osx_arm64_ffmpeg7python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg7python3.11.____cpython: + CONFIG: osx_arm64_ffmpeg7python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg7python3.12.____cpython: + CONFIG: osx_arm64_ffmpeg7python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg7python3.8.____cpython: + CONFIG: osx_arm64_ffmpeg7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_ffmpeg7python3.9.____cpython: + CONFIG: osx_arm64_ffmpeg7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + maxParallel: 12 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d7073721..ebbeca2a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,21 +8,37 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_ffmpeg6python3.10.____cpython: + CONFIG: win_64_ffmpeg6python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython + win_64_ffmpeg6python3.11.____cpython: + CONFIG: win_64_ffmpeg6python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython + win_64_ffmpeg6python3.12.____cpython: + CONFIG: win_64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython + win_64_ffmpeg6python3.8.____cpython: + CONFIG: win_64_ffmpeg6python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_ffmpeg6python3.9.____cpython: + CONFIG: win_64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7python3.10.____cpython: + CONFIG: win_64_ffmpeg7python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7python3.11.____cpython: + CONFIG: win_64_ffmpeg7python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7python3.12.____cpython: + CONFIG: win_64_ffmpeg7python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7python3.8.____cpython: + CONFIG: win_64_ffmpeg7python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_ffmpeg7python3.9.____cpython: + CONFIG: win_64_ffmpeg7python3.9.____cpython + UPLOAD_PACKAGES: 'True' + maxParallel: 6 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml rename to .ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml index a40d9e27..71881d74 100644 --- a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml rename to .ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml index ce3666d0..4add7f29 100644 --- a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml rename to .ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml index 5e9be5de..a7babcfe 100644 --- a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml rename to .ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml index f6dc32c6..111c442a 100644 --- a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml rename to .ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml index 47fd2ed6..c3a0ccce 100644 --- a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..09c22197 --- /dev/null +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..d7c4a7fa --- /dev/null +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..d1c21218 --- /dev/null +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..807702ba --- /dev/null +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..5a61db48 --- /dev/null +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- egl +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml rename to .ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml index f8ba183c..959b3e80 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml rename to .ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml index 1182b838..6f9ed2f0 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml rename to .ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml index 6ab083de..2fff054e 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml rename to .ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml index eb89e0a7..a401a731 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml rename to .ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml index 24f2bd5f..45032d24 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..0c9122a2 --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..d9e41e09 --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..834fda57 --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..d8168b40 --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..67bba252 --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- osmesa +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml rename to .ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml index 7e073283..1a771f8d 100644 --- a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml rename to .ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml index 60103140..d2007786 100644 --- a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml rename to .ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml index 68ed4a18..5c7f5b15 100644 --- a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml rename to .ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml index 3095c8a8..9b64c07f 100644 --- a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml rename to .ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml index 5d22cfe5..faaaba0d 100644 --- a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..b135307b --- /dev/null +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..f8739378 --- /dev/null +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..0b6eb71b --- /dev/null +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..a52dbc2f --- /dev/null +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..6f0d08a2 --- /dev/null +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,79 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml index 1153356f..81a9e11f 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml index e39c5501..c2ed4a92 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml index 849ea71a..7e091347 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml index ebb38da5..a9aaf2dc 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml index 2c23303a..20fa4fb8 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml @@ -56,8 +56,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..ad62e3ea --- /dev/null +++ b/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,77 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..3b0dfe3e --- /dev/null +++ b/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,77 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..4e9e0ef4 --- /dev/null +++ b/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,77 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..495d5fe1 --- /dev/null +++ b/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,77 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..ad1d4b4e --- /dev/null +++ b/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,77 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg6python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_ffmpeg6python3.10.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg6python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_ffmpeg6python3.11.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg6python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_ffmpeg6python3.12.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg6python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_ffmpeg6python3.8.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg6python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_ppc64le_python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_ffmpeg6python3.9.____cpython.yaml diff --git a/.ci_support/linux_ppc64le_ffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..a8ffca13 --- /dev/null +++ b/.ci_support/linux_ppc64le_ffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,69 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_ffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..4fae5219 --- /dev/null +++ b/.ci_support/linux_ppc64le_ffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,69 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_ffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..959506b4 --- /dev/null +++ b/.ci_support/linux_ppc64le_ffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,69 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_ffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..8bf65bb9 --- /dev/null +++ b/.ci_support/linux_ppc64le_ffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,69 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_ffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_ffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..d1a01ec4 --- /dev/null +++ b/.ci_support/linux_ppc64le_ffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,69 @@ +build_variant: +- qt +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +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 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zip_keys: +- - c_stdlib_version + - cdt_name +zlib: +- '1' diff --git a/.ci_support/migrations/ffmpeg7.yaml b/.ci_support/migrations/ffmpeg7.yaml new file mode 100644 index 00000000..ba8f6e94 --- /dev/null +++ b/.ci_support/migrations/ffmpeg7.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ffmpeg 7 + kind: version + migration_number: 1 +ffmpeg: +- '6' +- '7' +migrator_ts: 1714879707.672227 diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml index e8f1ff7b..ab4ffacb 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml index 6944de9b..f7c22693 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_python3.12.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml index f0b2ce51..f777cbe9 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml index 015534c1..c3e0d14f 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml index 43e3ff4c..cea9889d 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..8750048e --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..18bbe7ee --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..7acfe3f1 --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..0b8c17b8 --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..fc1682f0 --- /dev/null +++ b/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml index f1f8a23e..ce8bd9e0 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_python3.11.____cpython.yaml rename to .ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml index 45ac4ca0..b068bea1 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_python3.12.____cpython.yaml rename to .ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml index b830d18b..51bd281c 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml index e87c5625..f1d110e9 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml index 2fc7d9d3..389fe590 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml @@ -52,8 +52,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..eb4fb5f6 --- /dev/null +++ b/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,70 @@ +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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..27b91063 --- /dev/null +++ b/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,70 @@ +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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..52721500 --- /dev/null +++ b/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,70 @@ +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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..dfd4891b --- /dev/null +++ b/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,70 @@ +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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..e615fa55 --- /dev/null +++ b/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,70 @@ +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: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_ffmpeg6python3.10.____cpython.yaml index 5a32e1a6..5fc14445 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml @@ -42,8 +42,8 @@ pugixml: - '1.14' python: - 3.10.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.11.____cpython.yaml rename to .ci_support/win_64_ffmpeg6python3.11.____cpython.yaml index c4491ca3..73aefec9 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml @@ -42,8 +42,8 @@ pugixml: - '1.14' python: - 3.11.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.12.____cpython.yaml rename to .ci_support/win_64_ffmpeg6python3.12.____cpython.yaml index e3cdc003..705d2e6e 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml @@ -42,8 +42,8 @@ pugixml: - '1.14' python: - 3.12.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.8.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.8.____cpython.yaml rename to .ci_support/win_64_ffmpeg6python3.8.____cpython.yaml index 6cff077c..d87bca4b 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.8.____cpython.yaml @@ -42,8 +42,8 @@ pugixml: - '1.14' python: - 3.8.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_ffmpeg6python3.9.____cpython.yaml index 9a1d3278..bcd1d03a 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml @@ -42,8 +42,8 @@ pugixml: - '1.14' python: - 3.9.* *_cpython -qt_main: -- '5.15' +qt6_main: +- '6.7' sqlite: - '3' target_platform: diff --git a/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml new file mode 100644 index 00000000..005eae57 --- /dev/null +++ b/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml @@ -0,0 +1,58 @@ +build_variant: +- qt +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.10.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml new file mode 100644 index 00000000..9112cefa --- /dev/null +++ b/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml @@ -0,0 +1,58 @@ +build_variant: +- qt +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.11.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml new file mode 100644 index 00000000..662e1a3b --- /dev/null +++ b/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml @@ -0,0 +1,58 @@ +build_variant: +- qt +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.12.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml new file mode 100644 index 00000000..cbdd42ac --- /dev/null +++ b/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml @@ -0,0 +1,58 @@ +build_variant: +- qt +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.8.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml new file mode 100644 index 00000000..161ebd95 --- /dev/null +++ b/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml @@ -0,0 +1,58 @@ +build_variant: +- qt +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '7' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.3 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.1 +pugixml: +- '1.14' +python: +- 3.9.* *_cpython +qt6_main: +- '6.7' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.6 +zlib: +- '1' diff --git a/README.md b/README.md index 9d65f347..593f9140 100644 --- a/README.md +++ b/README.md @@ -32,283 +32,563 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipe/bld-base.bat b/recipe/bld-base.bat index 53c064bd..6f791b8b 100644 --- a/recipe/bld-base.bat +++ b/recipe/bld-base.bat @@ -30,6 +30,7 @@ cmake .. -G "Ninja" ^ -DVTK_MODULE_ENABLE_VTK_WebCore:STRING=YES ^ -DVTK_MODULE_ENABLE_VTK_WebGLExporter:STRING=YES ^ -DVTK_MODULE_ENABLE_VTK_WebPython:STRING=YES ^ + -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=OFF ^ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu:BOOL=OFF ^ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF ^ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF ^ diff --git a/recipe/build-base.sh b/recipe/build-base.sh index d9515ebd..5e07c6b5 100755 --- a/recipe/build-base.sh +++ b/recipe/build-base.sh @@ -7,6 +7,18 @@ BUILD_CONFIG=Release # Use bash "Remove Largest Suffix Pattern" to get rid of all but major version number PYTHON_MAJOR_VERSION=${PY_VER%%.*} +if [[ "${target_platform}" =~ osx-arm64 && "${target_platform}" != "${build_platform}" ]]; then + rm -f "${PREFIX}/lib/qt6/moc" + ln -s "${BUILD_PREFIX}/lib/qt6/moc" "${PREFIX}/lib/qt6/moc" + + # Additional debugging information + echo "Adjusted Qt tools for osx-arm64 with build variant qt6" + echo "Removed: ${PREFIX}/lib/qt6/moc" + echo "Linked to: ${BUILD_PREFIX}/lib/qt6/moc" +else + echo "Skipping Qt tools adjustment. Target platform: ${target_platform}, Build variant: $build_variant" +fi + VTK_ARGS=() if [[ "$build_variant" == "osmesa" ]]; then @@ -155,6 +167,7 @@ cmake -LAH .. -G "Ninja" ${CMAKE_ARGS} \ -DVTK_MODULE_ENABLE_VTK_WebPython:STRING=YES \ -DVTK_DATA_EXCLUDE_FROM_ALL:BOOL=ON \ -DVTK_USE_EXTERNAL:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \ @@ -162,6 +175,7 @@ cmake -LAH .. -G "Ninja" ${CMAKE_ARGS} \ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \ + -DQT_HOST_PATH:STRING="${PREFIX}" \ "${VTK_ARGS[@]}" # compile & install! diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45aa5ac5..06dd1098 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "9.2.6" %} -{% set build = 23 %} +{% set version = "9.3.0" %} +{% set build = 0 %} {% set minor_version = ".".join(version.split(".")[:2]) %} @@ -21,13 +21,16 @@ package: source: url: http://www.vtk.org/files/release/{{ minor_version }}/VTK-{{ version }}.tar.gz - sha256: 06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 + sha256: fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9 patches: - fix-threads-windows.patch # [win] # https://github.com/conda-forge/vtk-feedstock/pull/282 # https://gitlab.kitware.com/vtk/vtk/-/issues/18365#note_1079278 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9987 - patches/9987_try_except_python_import.patch # [not win] + # https://gitlab.kitware.com/vtk/vtk/-/issues/19258 + # https://gitlab.kitware.com/vtk/vtk/-/commit/db8f9efca220c9d16a30958e179abae3379d0011 + - patches/expat-backport.patch build: number: {{ build }} @@ -59,6 +62,7 @@ outputs: - ninja - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] + - qt6-main # [build_platform != target_platform] - {{ cdt('libselinux') }} # [linux and build_variant != "osmesa"] - {{ cdt('mesa-libgl-devel') }} # [linux and build_variant != "osmesa"] - {{ cdt('mesa-dri-drivers') }} # [linux and build_variant != "osmesa"] @@ -78,7 +82,6 @@ outputs: - libtiff - jsoncpp - expat - - expat <2.6 # https://gitlab.kitware.com/vtk/vtk/-/issues/19258 - tbb - tbb-devel # temporary pin: mesalib 24 fails @@ -117,7 +120,7 @@ outputs: - sqlite - gl2ps - pugixml - - qt-main # [not ppc64le and (build_variant == "qt")] + - qt6-main # [not ppc64le and (build_variant == "qt")] run: - python @@ -130,9 +133,6 @@ outputs: - libtiff - jsoncpp - expat - # expat run_exports accepts minor revisions - # but vtk is incompatible with 2.6: https://gitlab.kitware.com/vtk/vtk/-/issues/19258 - - libexpat <2.6 - tbb - mesalib >=21.0 # [build_variant == "osmesa"] - libnetcdf @@ -215,7 +215,7 @@ outputs: host: # We use ffmpeg here in the host section so that conda build # uses the global pinnings and ensures ffmpeg compatibility. - - ffmpeg + - ffmpeg run: - {{ pin_subpackage("vtk-base", exact=True) }} - ffmpeg diff --git a/recipe/patches/expat-backport.patch b/recipe/patches/expat-backport.patch new file mode 100644 index 00000000..0bf534a0 --- /dev/null +++ b/recipe/patches/expat-backport.patch @@ -0,0 +1,70 @@ +From db8f9efca220c9d16a30958e179abae3379d0011 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Mon, 15 Apr 2024 22:22:22 -0400 +Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly + +Newer `libexpat` doesn't like being given the appended data after the +artificially ended document anymore. Avoid pushing it through to its +parser. + +Fixes: #19258 +--- + IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++- + IO/XMLParser/vtkXMLDataParser.h | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx +index 1f6006d37c2..7d38092fdd7 100644 +--- a/IO/XMLParser/vtkXMLDataParser.cxx ++++ b/IO/XMLParser/vtkXMLDataParser.cxx +@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser() + this->RootElement = nullptr; + this->AppendedDataPosition = 0; + this->AppendedDataMatched = 0; ++ this->AppendedDataFound = false; + this->DataStream = nullptr; + this->InlineDataStream = vtkBase64InputStream::New(); + this->AppendedDataStream = vtkBase64InputStream::New(); +@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n"; ++ os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n"; + if (this->RootElement) + { + this->RootElement->PrintXML(os, indent); +@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete() + // If we have reached the appended data section, we stop parsing. + // This prevents the XML parser from having to walk over the entire + // appended data section. +- if (this->AppendedDataPosition) ++ if (this->AppendedDataPosition || this->AppendedDataFound) + { + return 1; + } +@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count) + { + return 0; + } ++ ++ this->AppendedDataFound = true; + } + + return 1; +diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h +index 1504a4d400b..142bf28327d 100644 +--- a/IO/XMLParser/vtkXMLDataParser.h ++++ b/IO/XMLParser/vtkXMLDataParser.h +@@ -204,6 +204,9 @@ protected: + // How much of the string "
VariantStatus
linux_64_build_varianteglpython3.10.____cpythonlinux_64_build_varianteglffmpeg6python3.10.____cpython - variant + variant
linux_64_build_varianteglpython3.11.____cpythonlinux_64_build_varianteglffmpeg6python3.11.____cpython - variant + variant
linux_64_build_varianteglpython3.12.____cpythonlinux_64_build_varianteglffmpeg6python3.12.____cpython - variant + variant
linux_64_build_varianteglpython3.8.____cpythonlinux_64_build_varianteglffmpeg6python3.8.____cpython - variant + variant
linux_64_build_varianteglpython3.9.____cpythonlinux_64_build_varianteglffmpeg6python3.9.____cpython - variant + variant
linux_64_build_variantosmesapython3.10.____cpythonlinux_64_build_varianteglffmpeg7python3.10.____cpython - variant + variant
linux_64_build_variantosmesapython3.11.____cpythonlinux_64_build_varianteglffmpeg7python3.11.____cpython - variant + variant
linux_64_build_variantosmesapython3.12.____cpythonlinux_64_build_varianteglffmpeg7python3.12.____cpython - variant + variant
linux_64_build_variantosmesapython3.8.____cpythonlinux_64_build_varianteglffmpeg7python3.8.____cpython - variant + variant
linux_64_build_variantosmesapython3.9.____cpythonlinux_64_build_varianteglffmpeg7python3.9.____cpython - variant + variant
linux_64_build_variantqtpython3.10.____cpythonlinux_64_build_variantosmesaffmpeg6python3.10.____cpython - variant + variant
linux_64_build_variantqtpython3.11.____cpythonlinux_64_build_variantosmesaffmpeg6python3.11.____cpython - variant + variant
linux_64_build_variantqtpython3.12.____cpythonlinux_64_build_variantosmesaffmpeg6python3.12.____cpython - variant + variant
linux_64_build_variantqtpython3.8.____cpythonlinux_64_build_variantosmesaffmpeg6python3.8.____cpython - variant + variant
linux_64_build_variantqtpython3.9.____cpythonlinux_64_build_variantosmesaffmpeg6python3.9.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonlinux_64_build_variantosmesaffmpeg7python3.10.____cpython - variant + variant
linux_aarch64_python3.11.____cpythonlinux_64_build_variantosmesaffmpeg7python3.11.____cpython - variant + variant
linux_aarch64_python3.12.____cpythonlinux_64_build_variantosmesaffmpeg7python3.12.____cpython - variant + variant
linux_aarch64_python3.8.____cpythonlinux_64_build_variantosmesaffmpeg7python3.8.____cpython - variant + variant
linux_aarch64_python3.9.____cpythonlinux_64_build_variantosmesaffmpeg7python3.9.____cpython - variant + variant
linux_ppc64le_python3.10.____cpythonlinux_64_build_variantqtffmpeg6python3.10.____cpython - variant + variant
linux_ppc64le_python3.11.____cpythonlinux_64_build_variantqtffmpeg6python3.11.____cpython - variant + variant
linux_ppc64le_python3.12.____cpythonlinux_64_build_variantqtffmpeg6python3.12.____cpython - variant + variant
linux_ppc64le_python3.8.____cpythonlinux_64_build_variantqtffmpeg6python3.8.____cpython - variant + variant
linux_ppc64le_python3.9.____cpythonlinux_64_build_variantqtffmpeg6python3.9.____cpython - variant + variant
osx_64_python3.10.____cpythonlinux_64_build_variantqtffmpeg7python3.10.____cpython - variant + variant
osx_64_python3.11.____cpythonlinux_64_build_variantqtffmpeg7python3.11.____cpython - variant + variant
osx_64_python3.12.____cpythonlinux_64_build_variantqtffmpeg7python3.12.____cpython - variant + variant
osx_64_python3.8.____cpythonlinux_64_build_variantqtffmpeg7python3.8.____cpython - variant + variant
osx_64_python3.9.____cpythonlinux_64_build_variantqtffmpeg7python3.9.____cpython - variant + variant
osx_arm64_python3.10.____cpythonlinux_aarch64_ffmpeg6python3.10.____cpython - variant + variant
osx_arm64_python3.11.____cpythonlinux_aarch64_ffmpeg6python3.11.____cpython - variant + variant
osx_arm64_python3.12.____cpythonlinux_aarch64_ffmpeg6python3.12.____cpython - variant + variant
osx_arm64_python3.8.____cpythonlinux_aarch64_ffmpeg6python3.8.____cpython - variant + variant
osx_arm64_python3.9.____cpythonlinux_aarch64_ffmpeg6python3.9.____cpython - variant + variant
win_64_python3.10.____cpythonlinux_aarch64_ffmpeg7python3.10.____cpython - variant + variant
win_64_python3.11.____cpythonlinux_aarch64_ffmpeg7python3.11.____cpython - variant + variant
win_64_python3.12.____cpythonlinux_aarch64_ffmpeg7python3.12.____cpython - variant + variant
win_64_python3.8.____cpythonlinux_aarch64_ffmpeg7python3.8.____cpython - variant + variant
win_64_python3.9.____cpythonlinux_aarch64_ffmpeg7python3.9.____cpython - variant + variant + +
linux_ppc64le_ffmpeg6python3.10.____cpython + + variant + +
linux_ppc64le_ffmpeg6python3.11.____cpython + + variant + +
linux_ppc64le_ffmpeg6python3.12.____cpython + + variant + +
linux_ppc64le_ffmpeg6python3.8.____cpython + + variant + +
linux_ppc64le_ffmpeg6python3.9.____cpython + + variant + +
linux_ppc64le_ffmpeg7python3.10.____cpython + + variant + +
linux_ppc64le_ffmpeg7python3.11.____cpython + + variant + +
linux_ppc64le_ffmpeg7python3.12.____cpython + + variant + +
linux_ppc64le_ffmpeg7python3.8.____cpython + + variant + +
linux_ppc64le_ffmpeg7python3.9.____cpython + + variant + +
osx_64_ffmpeg6python3.10.____cpython + + variant + +
osx_64_ffmpeg6python3.11.____cpython + + variant + +
osx_64_ffmpeg6python3.12.____cpython + + variant + +
osx_64_ffmpeg6python3.8.____cpython + + variant + +
osx_64_ffmpeg6python3.9.____cpython + + variant + +
osx_64_ffmpeg7python3.10.____cpython + + variant + +
osx_64_ffmpeg7python3.11.____cpython + + variant + +
osx_64_ffmpeg7python3.12.____cpython + + variant + +
osx_64_ffmpeg7python3.8.____cpython + + variant + +
osx_64_ffmpeg7python3.9.____cpython + + variant + +
osx_arm64_ffmpeg6python3.10.____cpython + + variant + +
osx_arm64_ffmpeg6python3.11.____cpython + + variant + +
osx_arm64_ffmpeg6python3.12.____cpython + + variant + +
osx_arm64_ffmpeg6python3.8.____cpython + + variant + +
osx_arm64_ffmpeg6python3.9.____cpython + + variant + +
osx_arm64_ffmpeg7python3.10.____cpython + + variant + +
osx_arm64_ffmpeg7python3.11.____cpython + + variant + +
osx_arm64_ffmpeg7python3.12.____cpython + + variant + +
osx_arm64_ffmpeg7python3.8.____cpython + + variant + +
osx_arm64_ffmpeg7python3.9.____cpython + + variant + +
win_64_ffmpeg6python3.10.____cpython + + variant + +
win_64_ffmpeg6python3.11.____cpython + + variant + +
win_64_ffmpeg6python3.12.____cpython + + variant + +
win_64_ffmpeg6python3.8.____cpython + + variant + +
win_64_ffmpeg6python3.9.____cpython + + variant + +
win_64_ffmpeg7python3.10.____cpython + + variant + +
win_64_ffmpeg7python3.11.____cpython + + variant + +
win_64_ffmpeg7python3.12.____cpython + + variant + +
win_64_ffmpeg7python3.8.____cpython + + variant + +
win_64_ffmpeg7python3.9.____cpython + + variant