From 5d5a197bb22b5a6b33e383f13e8beab43b090980 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:21:44 -0500 Subject: [PATCH] qgis v3.38.1 (#446) * updated v3.38.1 * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.19.18.26.47 * use libgdal-core and libpdal-core * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.22.16.24.15 * Update meta.yaml * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.24.15.58.55 --------- Co-authored-by: Isuru Fernando Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> --- .ci_support/linux_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.12.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.9.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.12.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.9.____cpython.yaml | 4 ++-- .ci_support/win_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/win_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/win_64_python3.12.____cpython.yaml | 4 ++-- .ci_support/win_64_python3.9.____cpython.yaml | 4 ++-- .scripts/build_steps.sh | 10 ++++++++-- recipe/meta.yaml | 10 +++++----- 22 files changed, 53 insertions(+), 47 deletions(-) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index dcef082f..43c9a440 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -32,14 +32,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index e0290c08..31325d9e 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -32,14 +32,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index a584e518..6acd1152 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -32,14 +32,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 0e262c1b..f92f68a2 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -32,14 +32,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 5ab871bb..43d103a8 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -36,14 +36,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 4035834f..047d0104 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -36,14 +36,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index c36fa9e2..3ff0a682 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -36,14 +36,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index ebe1bb5a..9cab0762 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -36,14 +36,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 8147e992..3dc42484 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - x86_64-apple-darwin13.4.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 98b210fd..0a8bb370 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - x86_64-apple-darwin13.4.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 4a4d0071..de959d32 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - x86_64-apple-darwin13.4.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index dffab858..c94c22cd 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - x86_64-apple-darwin13.4.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 6a770427..d4136d61 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - arm64-apple-darwin20.0.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 8ee4d482..4a9ac19b 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - arm64-apple-darwin20.0.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index eaff1848..716fb427 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - arm64-apple-darwin20.0.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index a509d092..620d434c 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -32,6 +32,8 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: @@ -40,8 +42,6 @@ libzip: - '1' macos_machine: - arm64-apple-darwin20.0.0 -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index cd8c3e2f..8cffe93f 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -22,14 +22,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 99e15586..f2f3b870 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -22,14 +22,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 1db700f8..1d33fafb 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -22,14 +22,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 2d3f0274..bc1da41f 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -22,14 +22,14 @@ icu: - '73' libgdal: - '3.9' +libpdal: +- '2.7' libprotobuf: - 4.25.3 libspatialindex: - 2.0.0 libzip: - '1' -pdal: -- '2.7' pin_run_as_build: python: min_pin: x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 961e07b3..0364fd6e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,12 @@ 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, @@ -51,7 +57,8 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y libXcomposite mesa-libGL-devel -# 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 @@ -80,7 +87,6 @@ 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.6.0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5fffd650..5e2a47eb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.38.0" %} +{% set version = "3.38.1" %} package: name: qgis @@ -6,7 +6,7 @@ package: source: url: https://qgis.org/downloads/qgis-{{ version }}.tar.bz2 - sha256: f9cf5ab241b9d6b3f5d40d4d7a6759a5f806148a7c9a11ba85670a03f2344be7 + sha256: c670f90e3929e7f76abe4a19f0dbf8c1b1f24f1b54c15a91839a8d0cedd05137 patches: - 0001-fix-protobuf-23.patch - 0002-skip-dot-in-path.patch # [win] @@ -15,7 +15,7 @@ source: - 0005-check-locks-not-destroyed.patch build: - number: 1 + number: 0 # pyproj no longer supports py38 skip: true # [py2k or py<39] @@ -111,8 +111,8 @@ requirements: # For PostgreSQL support. - postgresql - psycopg2 - # Point Clouds - - pdal + # Point Clouds. Need only C/C++ package + - libpdal - laz-perf - ocl-icd # [linux] - khronos-opencl-icd-loader # [win or osx]