diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cc00751e..7b1c77fd 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,10 +20,6 @@ jobs: CONFIG: linux_64_build_varianteglpython3.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 - 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 UPLOAD_PACKAGES: 'True' @@ -40,10 +36,6 @@ jobs: CONFIG: linux_64_build_variantosmesapython3.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 - 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 UPLOAD_PACKAGES: 'True' @@ -60,10 +52,6 @@ jobs: CONFIG: linux_64_build_variantqtpython3.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 - 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 UPLOAD_PACKAGES: 'True' @@ -80,10 +68,6 @@ jobs: CONFIG: linux_aarch64_python3.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 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.9.____cpython: CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -100,10 +84,6 @@ jobs: CONFIG: linux_ppc64le_python3.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 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.9.____cpython: CONFIG: linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 79030d57..5f820ea6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: @@ -17,9 +17,6 @@ jobs: osx_64_python3.12.____cpython: CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,9 +29,6 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d7073721..8a6d3fd5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,40 +17,22 @@ jobs: win_64_python3.12.____cpython: CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_python3.9.____cpython: CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml index a40d9e27..fce2a243 100644 --- a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_varianteglpython3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml index ce3666d0..ee0a485d 100644 --- a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_varianteglpython3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml index 5e9be5de..7bc2a1cc 100644 --- a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_varianteglpython3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml deleted file mode 100644 index f6dc32c6..00000000 --- a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml +++ /dev/null @@ -1,79 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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_varianteglpython3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml index 47fd2ed6..bf432dae 100644 --- a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantosmesapython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml index f8ba183c..95eae939 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantosmesapython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml index 1182b838..07c87d20 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantosmesapython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml index 6ab083de..b7e17b8d 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantosmesapython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml deleted file mode 100644 index eb89e0a7..00000000 --- a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml +++ /dev/null @@ -1,79 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml index 24f2bd5f..2f71993c 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantqtpython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml index 7e073283..cb8a51a3 100644 --- a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantqtpython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml index 60103140..c1878d1c 100644 --- a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantqtpython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml index 68ed4a18..4fa7c45d 100644 --- a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_variantqtpython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml deleted file mode 100644 index 3095c8a8..00000000 --- a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml +++ /dev/null @@ -1,79 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml index 5d22cfe5..a71b2b4f 100644 --- a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml @@ -13,17 +13,17 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 1153356f..51d6770e 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index e39c5501..0cb45d99 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 849ea71a..ce15e0f8 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml deleted file mode 100644 index ebb38da5..00000000 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ /dev/null @@ -1,77 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 2c23303a..71352ef2 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -31,7 +31,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -39,9 +41,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -51,13 +55,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -69,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_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index ff870b4c..2eae20ee 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,9 +37,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -47,7 +51,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: @@ -61,7 +65,7 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index abe84c60..756aa401 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,9 +37,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -47,7 +51,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: @@ -61,7 +65,7 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 6adf39b6..2a3d8ee3 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,9 +37,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -47,7 +51,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: @@ -61,7 +65,7 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml deleted file mode 100644 index c113d73d..00000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ /dev/null @@ -1,69 +0,0 @@ -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: -- '6' -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_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index cc48f683..d76d24c6 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,9 +37,11 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libuuid: - '2' +libxcb: +- '1' libxml2: - '2' lz4_c: @@ -47,7 +51,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: @@ -61,7 +65,7 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zip_keys: - - c_stdlib_version - cdt_name diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index e8f1ff7b..3f5f8d19 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 6944de9b..cef57705 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index f0b2ce51..a532be60 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml deleted file mode 100644 index 015534c1..00000000 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 43e3ff4c..60049fed 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index f1f8a23e..4c456ba1 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 45ac4ca0..29146d72 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index b830d18b..2c2eb7e2 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml deleted file mode 100644 index e87c5625..00000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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: -- '6' -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 -qt_main: -- '5.15' -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_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 2fc7d9d3..f635aaca 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -27,7 +27,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -35,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -47,13 +49,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -65,6 +67,6 @@ tbb_devel: tk: - '8.6' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 5a32e1a6..9032de05 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -19,7 +19,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -27,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -37,13 +39,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.10.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -53,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index c4491ca3..33e33b7b 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -19,7 +19,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -27,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -37,13 +39,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.11.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -53,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index e3cdc003..7b3c7275 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -19,7 +19,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -27,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -37,13 +39,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.12.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -53,6 +55,6 @@ tbb: tbb_devel: - '2021' vtk: -- 9.2.6 +- 9.3.0 zlib: - '1' diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml deleted file mode 100644 index 6cff077c..00000000 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,58 +0,0 @@ -build_variant: -- qt -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -expat: -- '2' -ffmpeg: -- '6' -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 -qt_main: -- '5.15' -sqlite: -- '3' -target_platform: -- win-64 -tbb: -- '2021' -tbb_devel: -- '2021' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 9a1d3278..ebda37ac 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: expat: - '2' ffmpeg: -- '6' +- '7' freetype: - '2' glew: @@ -19,7 +19,9 @@ glew: hdf5: - 1.14.3 jsoncpp: -- 1.9.5 +- 1.9.6 +libboost_headers: +- '1.84' libjpeg_turbo: - '3' libnetcdf: @@ -27,7 +29,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4.6' +- '4.7' libxml2: - '2' lz4_c: @@ -37,13 +39,13 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.3.1 +- '9.5' pugixml: - '1.14' python: - 3.9.* *_cpython qt_main: -- '5.15' +- 5.15.8 sqlite: - '3' target_platform: @@ -53,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 9e37a3b2..08701313 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,25 +31,31 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y mesa-libGL-devel - +) # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -80,6 +86,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..7f948c41 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -85,6 +96,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d546976..d3c0345e 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,52 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Moving pkgs cache from %MAMBA_ROOT_PREFIX% to %MINIFORGE_HOME% +move /Y "%MAMBA_ROOT_PREFIX%\pkgs" "%MINIFORGE_HOME%" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! 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 -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -48,7 +70,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 @@ -58,6 +80,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index 9d65f347..340e6dd2 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,6 @@ Current build status variant - - linux_64_build_varianteglpython3.8.____cpython - - - variant - - linux_64_build_varianteglpython3.9.____cpython @@ -87,13 +80,6 @@ Current build status variant - - linux_64_build_variantosmesapython3.8.____cpython - - - variant - - linux_64_build_variantosmesapython3.9.____cpython @@ -122,13 +108,6 @@ Current build status variant - - linux_64_build_variantqtpython3.8.____cpython - - - variant - - linux_64_build_variantqtpython3.9.____cpython @@ -157,13 +136,6 @@ Current build status variant - - linux_aarch64_python3.8.____cpython - - - variant - - linux_aarch64_python3.9.____cpython @@ -192,13 +164,6 @@ Current build status variant - - linux_ppc64le_python3.8.____cpython - - - variant - - linux_ppc64le_python3.9.____cpython @@ -227,13 +192,6 @@ Current build status variant - - osx_64_python3.8.____cpython - - - variant - - osx_64_python3.9.____cpython @@ -262,13 +220,6 @@ Current build status variant - - osx_arm64_python3.8.____cpython - - - variant - - osx_arm64_python3.9.____cpython @@ -297,13 +248,6 @@ Current build status variant - - win_64_python3.8.____cpython - - - variant - - win_64_python3.9.____cpython diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da9..32da3d0c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index e0d408d0..6788aea6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45aa5ac5..63624b42 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.2.6" %} -{% set build = 23 %} +{% set build = 24 %} {% set minor_version = ".".join(version.split(".")[:2]) %} @@ -24,10 +24,14 @@ source: sha256: 06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 patches: - fix-threads-windows.patch # [win] + - patches/fix-gcc13.patch #[linux] # 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 }} @@ -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 @@ -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 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 " +Date: Tue, 17 Jan 2023 16:18:53 +0100 +Subject: [PATCH 1/2] Add #include to compile with gcc13 + +The `vtkSEPReader` was introduced by MRs !4909 (from my former +collaborator Maxime) and !4938. Then it was highly modified by +!7516. The later MR is the one that introduced the uses of +`std::uint8_t` and `std::uint32_t`. + +Those types needs the inclusion of ``. +--- + IO/Image/vtkSEPReader.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h +index 83d127a41e4..b9110780f26 100644 +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t and std::uint32_t ++#include // for std::string + + namespace details + { +-- +GitLab + + +From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001 +From: Mathieu Westphal +Date: Thu, 23 Feb 2023 18:06:07 +0100 +Subject: [PATCH 2/2] More #include to compile with gcc13 + +--- + IO/PIO/PIOData.h | 1 + + Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/IO/PIO/PIOData.h b/IO/PIO/PIOData.h +index 98137f44c1c..03e59f7c832 100644 +--- a/IO/PIO/PIOData.h ++++ b/IO/PIO/PIOData.h +@@ -1,6 +1,7 @@ + #if !defined(_PIODATA_H) + #define _PIODATA_H + ++#include + #include + #include + #include +diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +index ca5445ddf4b..d0ba449a3c0 100644 +--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -49,7 +49,8 @@ + #include "vtkMathTextUtilities.h" + #include "vtkRenderingMatplotlibModule.h" // For export macro + +-#include // for std::vector ++#include // for std::uint64_t ++#include // for std::vector + + struct _object; + typedef struct _object PyObject; +-- +GitLab +