From aefb799770d163ad18c4aa846b7ce16f7118a502 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 23 Sep 2024 00:22:37 +0200 Subject: [PATCH 1/2] Ensure that vtk can be installed with both ffmpeg==6 and ffmpeg==7 --- recipe/meta.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 536db22d..85feb1d7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.3.1" %} -{% set build = 6 %} +{% set build = 7 %} {% set minor_version = ".".join(version.split(".")[:2]) %} @@ -234,11 +234,18 @@ outputs: - name: vtk build: + ignore_run_exports_from: + - ffmpeg string: "{{ build_variant }}_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ build }}" run_exports: - {{ pin_subpackage('vtk-base', max_pin='x.x.x') }} requirements: build: [] + host: + # We include ffmpeg in the host dependency so the PKG_HASH is different between + # ffmpeg==6 and ffmpeg==7 builds, avoiding the issue described in + # https://github.com/conda-forge/vtk-feedstock/issues/347 + - ffmpeg run: - {{ pin_subpackage("vtk-base", exact=True) }} - {{ pin_subpackage("vtk-io-ffmpeg", exact=True) }} # [not win] From 3cda38bfb7e37dd65f5d3ecc3afd1cd9b194cd29 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:26:46 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.22.22.03.49 --- ...nux_64_build_varianteglffmpeg6python3.10.____cpython.yaml | 4 ++-- ...nux_64_build_varianteglffmpeg6python3.11.____cpython.yaml | 4 ++-- ...nux_64_build_varianteglffmpeg6python3.12.____cpython.yaml | 4 ++-- ...inux_64_build_varianteglffmpeg6python3.9.____cpython.yaml | 4 ++-- ...nux_64_build_varianteglffmpeg7python3.10.____cpython.yaml | 4 ++-- ...nux_64_build_varianteglffmpeg7python3.11.____cpython.yaml | 4 ++-- ...nux_64_build_varianteglffmpeg7python3.12.____cpython.yaml | 4 ++-- ...inux_64_build_varianteglffmpeg7python3.9.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg6python3.10.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg6python3.11.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg6python3.12.____cpython.yaml | 4 ++-- ...x_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg7python3.10.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg7python3.11.____cpython.yaml | 4 ++-- ..._64_build_variantosmesaffmpeg7python3.12.____cpython.yaml | 4 ++-- ...x_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg6python3.10.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg6python3.11.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg6python3.12.____cpython.yaml | 4 ++-- ...linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg7python3.10.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg7python3.11.____cpython.yaml | 4 ++-- ...inux_64_build_variantqtffmpeg7python3.12.____cpython.yaml | 4 ++-- ...linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg6python3.10.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg6python3.11.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg6python3.12.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg6python3.9.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg7python3.10.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg7python3.11.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg7python3.12.____cpython.yaml | 4 ++-- .ci_support/win_64_ffmpeg7python3.9.____cpython.yaml | 4 ++-- .scripts/build_steps.sh | 5 ++--- .scripts/run_win_build.bat | 4 ++-- build-locally.py | 2 +- 59 files changed, 117 insertions(+), 118 deletions(-) diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml index 6a030112..bda9b05c 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml index e6522a2d..160f3060 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml index 69867574..ce1a98f8 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml index d1dd7434..cd8a30af 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg6python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml index 77b56b79..a3e8c7c6 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml index c07f32f3..c15497c7 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml index 54945711..2f7e6888 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml index a57eae2d..0c706cdb 100644 --- a/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglffmpeg7python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml index 5de181e8..fa7bde1f 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml index 1cf7713e..4dbae6cc 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml index f99307ba..c0771ae7 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml index f80ee32b..ece8b117 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml index d05b7b3e..34c2baae 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml index b8f5bcff..bc134b52 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml index 1c4824c8..96e277dd 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml index dfeea1a3..87f01d87 100644 --- a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml index 4476cb57..950ba98e 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml index edc018ec..12f74fc1 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml index c91c19fc..8658f57f 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml index 68961193..5b9baab4 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg6python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml index c99638bc..cf735e48 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml index 139019b9..589b5060 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml index 732bae8d..271a02e4 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml index a00c6922..aa026767 100644 --- a/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtffmpeg7python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml index af5c68b7..dd25d177 100644 --- a/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml index 4026b4c9..c493fc21 100644 --- a/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml index f1796b0f..5585fc24 100644 --- a/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml index be2db23e..88ef8c43 100644 --- a/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg6python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml index a072e6bf..062db18f 100644 --- a/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml index 37632984..8bd5c9c3 100644 --- a/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml index 59fcde00..ee959e85 100644 --- a/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml index 8ed1915a..9d8fb845 100644 --- a/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_ffmpeg7python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' libxcb: @@ -73,7 +73,7 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml index 509a0108..69f0bae1 100644 --- a/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.10.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml index b9002aed..8da245fc 100644 --- a/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.11.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml index 9d4b0c7f..d1933374 100644 --- a/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.12.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml index 66e2bb35..4d262146 100644 --- a/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg6python3.9.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml index 760699b3..a1507523 100644 --- a/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg7python3.10.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml index de477029..089a8820 100644 --- a/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg7python3.11.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml index 64a7a12d..cccf9509 100644 --- a/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg7python3.12.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml index 3faa75ff..de8ca704 100644 --- a/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/osx_64_ffmpeg7python3.9.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml index e312ddc3..3658432d 100644 --- a/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.10.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml index 3131356f..9752dc43 100644 --- a/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.11.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml index 6d123a6c..e9616b58 100644 --- a/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.12.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml index ad300aad..c582c8a1 100644 --- a/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg6python3.9.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml index aecff090..ec05c416 100644 --- a/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg7python3.10.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml index 5fbff18a..0dda0344 100644 --- a/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg7python3.11.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml index 9727dc92..8f5daa35 100644 --- a/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg7python3.12.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml index 84ac9083..cb316b26 100644 --- a/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_ffmpeg7python3.9.____cpython.yaml @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -67,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml index 6c276432..66a0201d 100644 --- a/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml index 2d278ada..8c1ce8d2 100644 --- a/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml index 571af64a..150a7ff5 100644 --- a/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.12.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml index 99f43bbe..572c0b2e 100644 --- a/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg6python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml index 1e61d9c3..f4caa9c6 100644 --- a/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg7python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml index c53c4735..fcee8094 100644 --- a/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg7python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml index 9aecb623..e3e328d7 100644 --- a/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg7python3.12.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml index 579abd9d..1882b2fa 100644 --- a/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml +++ b/.ci_support/win_64_ffmpeg7python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -55,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 126db4e9..cadf938b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -55,10 +55,9 @@ ulimit -n 1024 # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y mesa-libGL mesa-libGL-devel mesa-libEGL-devel mesa-dri-drivers libX11-devel libglvnd-glx libglvnd-egl libglvnd-opengl +) - - -)# make the build number clobber +# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf2..a45c34fd 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/build-locally.py b/build-locally.py index 8ac9b846..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally.