diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index bcca91c9..b133ba00 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -75,7 +75,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/migrations/icu72.yaml b/.ci_support/migrations/icu72.yaml deleted file mode 100644 index 465adac9..00000000 --- a/.ci_support/migrations/icu72.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -icu: -- '72' -migrator_ts: 1679327092.7504842 diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 43cbfea1..92362398 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -102,4 +102,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584b..3969edf3 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dd110565..2dcf522a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.32.0" %} +{% set version = "3.32.1" %} package: name: qgis @@ -6,7 +6,7 @@ package: source: url: https://qgis.org/downloads/qgis-{{ version }}.tar.bz2 - sha256: dfc90a6103a3c6020d005dbb68c81caf9a4c11fca4be53bfe070226813f87a9a + sha256: 6a31abd2869f0850724d88c164703cf161c83893adc663a32e68da685f48b7b2 patches: # now need define on all platforms - 0001-use-protobuf-dlls.patch @@ -15,9 +15,9 @@ source: - 0003-workaround-multi-pyqt5.patch # [win] - 0004-wrench_threads.patch - 0005-check-locks-not-destroyed.patch - + build: - number: 5 + number: 0 # pyproj no longer supports py38 skip: true # [py2k or py<39]