diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 643c7072..36fbb470 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -23,6 +23,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -44,7 +45,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'liblief=0.11.5 conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa liblief=0.11.5 conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -81,6 +82,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml index be728080..c9981335 100644 --- a/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml index e80d7e98..b404b773 100644 --- a/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml index 539c96c5..e129120b 100644 --- a/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml index 37881e78..a8e27bff 100644 --- a/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_varianteglpython3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml index 09a720ce..4441f856 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml index 00585264..5d0123ed 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml index 068cf3ba..b3bfb97b 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml index 1afe9071..cf71948c 100644 --- a/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantosmesapython3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml index c1872c8b..371af323 100644 --- a/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml index 2ea1e248..31c1b93d 100644 --- a/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml index 3bed9596..1e9f6513 100644 --- a/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml index 1406655a..1ef7b719 100644 --- a/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_build_variantqtpython3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -21,7 +21,7 @@ ffmpeg: fortran_compiler: - gfortran fortran_compiler_version: -- '10' +- '11' freetype: - '2' glew: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 887a4649..fa944397 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index a3962ec9..5581616a 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 7a27e34b..e9a23d95 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index f5e7e7e4..2fccebf6 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -37,7 +37,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 920c8306..ffcd378c 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -33,7 +33,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 69cb47fc..42b30b52 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -33,7 +33,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 6b864e0f..8cdb525b 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -33,7 +33,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 16296c30..19b3368f 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: @@ -33,7 +33,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/migrations/proj910.yaml b/.ci_support/migrations/proj910.yaml deleted file mode 100644 index 110433bb..00000000 --- a/.ci_support/migrations/proj910.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1662435845.2454011 -proj: -- 9.1.0 diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 013a8776..be4df408 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 497acbfe..2317e376 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 529db548..78a98ca5 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index dd5c843d..b1ebb9e7 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index c081c098..e542ba55 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index cfee11b7..799bac5f 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 8c179067..d0fb328b 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 7c3b4650..e15721eb 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -31,7 +31,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 6d6f5d4f..f789bc4d 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index d3e69bdf..58d859be 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -27,7 +27,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index ea5f6900..38265aba 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -27,7 +27,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index e5c442a8..8b222530 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -27,7 +27,7 @@ libnetcdf: libpng: - '1.6' libtiff: -- '4' +- '4.4' libxml2: - '2.10' lz4_c: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24..8b4ef2f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 65cbdd91..f43d5b86 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,7 +23,6 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['liblief=0.11.5', 'conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ conda-build pip boa liblief=0.11.5 conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ diff --git a/README.md b/README.md index 2ca4cc90..85f70034 100644 --- a/README.md +++ b/README.md @@ -35,224 +35,224 @@ Current build status linux_64_build_varianteglpython3.10.____cpython - variant + variant linux_64_build_varianteglpython3.11.____cpython - variant + variant linux_64_build_varianteglpython3.8.____cpython - variant + variant linux_64_build_varianteglpython3.9.____cpython - variant + variant linux_64_build_variantosmesapython3.10.____cpython - variant + variant linux_64_build_variantosmesapython3.11.____cpython - variant + variant linux_64_build_variantosmesapython3.8.____cpython - variant + variant linux_64_build_variantosmesapython3.9.____cpython - variant + variant linux_64_build_variantqtpython3.10.____cpython - variant + variant linux_64_build_variantqtpython3.11.____cpython - variant + variant linux_64_build_variantqtpython3.8.____cpython - variant + variant linux_64_build_variantqtpython3.9.____cpython - variant + variant linux_aarch64_python3.10.____cpython - variant + variant linux_aarch64_python3.11.____cpython - variant + variant linux_aarch64_python3.8.____cpython - variant + variant linux_aarch64_python3.9.____cpython - variant + variant linux_ppc64le_python3.10.____cpython - variant + variant linux_ppc64le_python3.11.____cpython - variant + variant linux_ppc64le_python3.8.____cpython - variant + variant linux_ppc64le_python3.9.____cpython - variant + variant osx_64_python3.10.____cpython - variant + variant osx_64_python3.11.____cpython - variant + variant osx_64_python3.8.____cpython - variant + variant osx_64_python3.9.____cpython - variant + variant osx_arm64_python3.10.____cpython - variant + variant osx_arm64_python3.11.____cpython - variant + variant osx_arm64_python3.8.____cpython - variant + variant osx_arm64_python3.9.____cpython - variant + variant win_64_python3.10.____cpython - variant + variant win_64_python3.11.____cpython - variant + variant win_64_python3.8.____cpython - variant + variant win_64_python3.9.____cpython - variant + variant diff --git a/recipe/bld.bat b/recipe/bld.bat index b153d24f..de2105ce 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -22,6 +22,7 @@ cmake .. -G "Ninja" ^ -DVTK_PYTHON_VERSION:STRING="%PYTHON_MAJOR_VERSION%" ^ -DPython3_FIND_STRATEGY=LOCATION ^ -DPython3_ROOT_DIR="%PREFIX%" ^ + -DVTK_BUILD_PYI_FILES:BOOL=ON ^ -DVTK_HAS_FEENABLEEXCEPT:BOOL=OFF ^ -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB ^ -DVTK_DATA_EXCLUDE_FROM_ALL:BOOL=ON ^ @@ -49,7 +50,7 @@ REM See https://setuptools.readthedocs.io/en/latest/pkg_resources.html#workingse set egg_info=%SP_DIR%\vtk-%PKG_VERSION%.egg-info echo>%egg_info% Metadata-Version: 2.1 -echo>>%egg_info% Version: $PKG_VERSION +echo>>%egg_info% Version: %PKG_VERSION% echo>>%egg_info% Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization echo>>%egg_info% Platform: UNKNOWN diff --git a/recipe/build.sh b/recipe/build.sh index 44fb2a2d..632501cf 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -100,6 +100,13 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then CMAKE_ARGS="${CMAKE_ARGS} -DXDMF_REQUIRE_LARGE_FILE_SUPPORT_EXITCODE=0 -DXDMF_REQUIRE_LARGE_FILE_SUPPORT_EXITCODE__TRYRUN_OUTPUT=" fi +# Only build pyi files when natively compiling +if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then + CMAKE_ARGS="${CMAKE_ARGS} -DVTK_BUILD_PYI_FILES:BOOL=OFF" +else + CMAKE_ARGS="${CMAKE_ARGS} -DVTK_BUILD_PYI_FILES:BOOL=ON" +fi + mkdir build cd build || exit @@ -122,9 +129,7 @@ cmake -LAH .. -G "Ninja" ${CMAKE_ARGS} \ -DVTK_HAS_FEENABLEEXCEPT:BOOL=OFF \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_PYTHON_VERSION:STRING="${PYTHON_MAJOR_VERSION}" \ - -DPython3_FIND_STRATEGY=LOCATION \ - -DPython3_ROOT_DIR=${PREFIX} \ - -DPython3_EXECUTABLE=${PREFIX}/bin/python \ + -DPython3_EXECUTABLE=$PYTHON \ -DVTK_MODULE_ENABLE_VTK_PythonInterpreter:STRING=NO \ -DVTK_MODULE_ENABLE_VTK_RenderingFreeType:STRING=YES \ -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib:STRING=YES \ diff --git a/recipe/fix-threads-windows.patch b/recipe/fix-threads-windows.patch new file mode 100644 index 00000000..08fe9d76 --- /dev/null +++ b/recipe/fix-threads-windows.patch @@ -0,0 +1,14 @@ +diff --git a/Common/Core/CMakeLists.txt b/Common/Core/CMakeLists.txt +index 96f59bb6322..b0591aa6912 100644 +--- a/Common/Core/CMakeLists.txt ++++ b/Common/Core/CMakeLists.txt +@@ -368,6 +368,9 @@ set(vtk_include_dirs) + vtk_module_find_package( + PACKAGE Threads) + ++set(CMAKE_USE_PTHREADS_INIT 0) ++set(CMAKE_USE_WIN32_THREADS_INIT 1) ++ + set(VTK_MAX_THREADS "64" CACHE STRING + "Max number of threads vtkMultiThreader will allocate.") + mark_as_advanced(VTK_MAX_THREADS) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f9246149..3ea8d7d9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.2.2" %} -{% set build = 4 %} +{% set build = 5 %} {% set minor_version = ".".join(version.split(".")[:2]) %} @@ -13,6 +13,8 @@ package: source: url: http://www.vtk.org/files/release/{{ minor_version }}/VTK-{{ version }}.tar.gz sha256: 1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075 + patches: + - fix-threads-windows.patch # [win] build: number: {{ build }}