From 1b333559536554c9daf6f585f40334150b0fedac Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 26 Dec 2023 13:08:05 +0000 Subject: [PATCH 1/6] updated v1.3.9 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3bb9c46..785ca85 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.3.8" %} +{% set version = "1.3.9" %} {% set build_number = 0 %} package: @@ -7,14 +7,14 @@ package: source: url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz - sha256: 50e3522ce56e674eeb6dc299970a719ff280c6d3329e1661e290b379dd931113 + sha256: 44ae3764595778077d4bc40b0756c90f483b816927e82206e9f376e31a2dc533 patches: - fix_install_hires_instructions.patch build: number: {{ build_number }} - skip: true # [s390x] # Missing dependencies. - skip: true # [win32] # Missing dependencies in win32 arch and not expecting they will be updated. + skip: true # [s390x] + skip: true # [win32] skip: true # [python_impl == 'pypy'] requirements: @@ -25,8 +25,8 @@ requirements: outputs: - name: basemap - script: build-basemap.sh # [not win] # This script will delete `pyproject.toml`. Remove ASAP. - script: bld-basemap.bat # [win] # This script will delete `pyproject.toml`. Remove ASAP. + script: build-basemap.sh # [not win] + script: bld-basemap.bat # [win] build: skip: true # [python_impl == 'pypy'] requirements: @@ -78,7 +78,7 @@ outputs: - name: basemap-data version: 1.3.2 script: build-basemap.sh # [not win] - script: bld-basemap.bat # [win] + script: bld-basemap.bat # [win] build: noarch: python requirements: @@ -101,7 +101,7 @@ outputs: - name: basemap-data-hires version: 1.3.2 script: build-basemap.sh # [not win] - script: bld-basemap.bat # [win] + script: bld-basemap.bat # [win] build: noarch: python requirements: From 8e1f792ba20dbae7d1a93d6a6ced766c7dba9021 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 26 Dec 2023 13:08:19 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and conda-forge-pinning 2023.12.24.07.24.16 --- .azure-pipelines/azure-pipelines-linux.yml | 3 + .azure-pipelines/azure-pipelines-osx.yml | 3 + .azure-pipelines/azure-pipelines-win.yml | 56 ++------ ...hon3.10.____cpythonpython_implcpython.yaml | 2 +- ...hon3.11.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- .ci_support/migrations/python311.yaml | 37 ------ ...hon3.10.____cpythonpython_implcpython.yaml | 6 +- ...hon3.11.____cpythonpython_implcpython.yaml | 6 +- ...thon3.8.____cpythonpython_implcpython.yaml | 6 +- ...thon3.9.____cpythonpython_implcpython.yaml | 6 +- ...hon3.10.____cpythonpython_implcpython.yaml | 2 +- ...hon3.11.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- .gitignore | 14 +- .scripts/build_steps.sh | 20 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 3 + .scripts/run_osx_build.sh | 17 ++- .scripts/run_win_build.bat | 120 ++++++++++++++++++ README.md | 2 +- 23 files changed, 201 insertions(+), 118 deletions(-) delete mode 100644 .ci_support/migrations/python311.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 00f06d1..18a5bcf 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -37,6 +37,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 80e5f5f..b3d8a03 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -26,6 +26,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ea7c819..5d75ede 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -26,6 +26,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -44,52 +45,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - 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 - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index 08b94a2..c990e0b 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index 6376cd0..7d60942 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index 5fa21b2..28092de 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index 2e9b85e..3d195a4 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index c00be95..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 60 - max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 0e7ad58..0e8db96 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' geos: -- 3.12.0 +- 3.12.1 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index 1c79bb4..2da40e5 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' geos: -- 3.12.0 +- 3.12.1 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index 2a6ae4e..4093170 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' geos: -- 3.12.0 +- 3.12.1 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 53245e6..90ed508 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' geos: -- 3.12.0 +- 3.12.1 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml index 32a80a4..fd49818 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml index 2df2a4e..e9c7688 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml index 0dd37f1..0d39820 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml index b218fa8..25f2027 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 geos: -- 3.12.0 +- 3.12.1 pin_run_as_build: python: min_pin: x.x diff --git a/.gitignore b/.gitignore index c89ecb7..c002910 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +* +!/conda-forge.yml -build_artifacts +!/*/ +!/recipe/** +!/.ci_support/** + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..5382195 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -53,6 +54,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -66,7 +73,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 5ef2a19..1fa8468 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} 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 \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -73,7 +79,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( 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 new file mode 100755 index 0000000..7bde26b --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,120 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: 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 +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: 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 boa conda-forge-ci-setup=4 -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 +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) + +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%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index d2f8d39..9052784 100644 --- a/README.md +++ b/README.md @@ -240,7 +240,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 64f166fbfe3968f951cf3b4050e5afaac7091b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Tue, 26 Dec 2023 16:57:49 +0100 Subject: [PATCH 3/6] Downgrade clang compiler version to 14 --- .../osx_64_python3.10.____cpythonpython_implcpython.yaml | 4 ++-- .../osx_64_python3.11.____cpythonpython_implcpython.yaml | 4 ++-- .../osx_64_python3.8.____cpythonpython_implcpython.yaml | 4 ++-- .../osx_64_python3.9.____cpythonpython_implcpython.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 0e8db96..472f770 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '14' geos: - 3.12.1 macos_machine: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index 2da40e5..02079ce 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '14' geos: - 3.12.1 macos_machine: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index 4093170..74a2860 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '14' geos: - 3.12.1 macos_machine: diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 90ed508..223d71e 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '14' geos: - 3.12.1 macos_machine: From 74119e1fa5f1d6ee988375903ee4a6445e73fb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Tue, 26 Dec 2023 17:00:31 +0100 Subject: [PATCH 4/6] Revert removal of comments in meta.yaml --- recipe/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 785ca85..fc05d40 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,9 @@ source: build: number: {{ build_number }} + # Missing dependencies in s390x. skip: true # [s390x] + # Missing dependencies in win32 and not expecting they will be updated. skip: true # [win32] skip: true # [python_impl == 'pypy'] @@ -25,8 +27,9 @@ requirements: outputs: - name: basemap + # These scripts will delete `pyproject.toml`. Remove ASAP. script: build-basemap.sh # [not win] - script: bld-basemap.bat # [win] + script: bld-basemap.bat # [win] build: skip: true # [python_impl == 'pypy'] requirements: @@ -78,7 +81,7 @@ outputs: - name: basemap-data version: 1.3.2 script: build-basemap.sh # [not win] - script: bld-basemap.bat # [win] + script: bld-basemap.bat # [win] build: noarch: python requirements: @@ -101,7 +104,7 @@ outputs: - name: basemap-data-hires version: 1.3.2 script: build-basemap.sh # [not win] - script: bld-basemap.bat # [win] + script: bld-basemap.bat # [win] build: noarch: python requirements: From 29df24a8f1d4fbd2014260540509c6b2d2781e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Tue, 26 Dec 2023 17:07:10 +0100 Subject: [PATCH 5/6] Update runtime dependencies in meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc05d40..f17f375 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,8 +53,8 @@ outputs: - {{ pin_compatible('numpy') }} - {{ pin_compatible('geos') }} - matplotlib-base >=1.5,<3.8 - - pyproj >=1.9.3,<3.6 - - pyshp >=1.2.0,<2.4 + - pyproj >=1.9.3,<3.7.0 + - pyshp >=1.2.0,<2.4.0 test: imports: - mpl_toolkits.basemap From 94e9726f11896bc75726fba5dec75c9146d2d403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Tue, 26 Dec 2023 17:12:01 +0100 Subject: [PATCH 6/6] Add patch to set numpy upper pin to 1.27 --- recipe/fix_install_hires_instructions.patch | 6 +++--- recipe/fix_numpy_requirements.patch | 12 ++++++++++++ recipe/meta.yaml | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 recipe/fix_numpy_requirements.patch diff --git a/recipe/fix_install_hires_instructions.patch b/recipe/fix_install_hires_instructions.patch index 4b418d8..550952d 100644 --- a/recipe/fix_install_hires_instructions.patch +++ b/recipe/fix_install_hires_instructions.patch @@ -1,6 +1,6 @@ -diff -ru basemap-1.3.6.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py basemap-1.3.6/packages/basemap/src/mpl_toolkits/basemap/__init__.py ---- basemap-1.3.6.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2023-02-25 11:30:44.690631200 +0100 -+++ basemap-1.3.6/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2023-02-25 11:31:22.559285100 +0100 +diff -ru basemap-1.3.9.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py basemap-1.3.9/packages/basemap/src/mpl_toolkits/basemap/__init__.py +--- basemap-1.3.9.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2023-12-26 11:45:00 ++++ basemap-1.3.9/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2023-12-26 11:45:00 @@ -1228,7 +1228,8 @@ Unable to open boundary dataset file. Only the 'crude', 'low' and 'intermediate' resolution datasets are installed by default. If you diff --git a/recipe/fix_numpy_requirements.patch b/recipe/fix_numpy_requirements.patch new file mode 100644 index 0000000..c4db597 --- /dev/null +++ b/recipe/fix_numpy_requirements.patch @@ -0,0 +1,12 @@ +diff -ru basemap-1.3.9.orig/packages/basemap/requirements.txt basemap-1.3.9/packages/basemap/requirements.txt +--- basemap-1.3.9.orig/packages/basemap/requirements.txt 2023-12-26 11:45:00 ++++ basemap-1.3.9/packages/basemap/requirements.txt 2023-12-26 11:45:00 +@@ -8,7 +8,7 @@ + numpy >= 1.16, < 1.19; python_version == "3.5" + numpy >= 1.19, < 1.20; python_version == "3.6" + numpy >= 1.21, < 1.22; python_version == "3.7" +-numpy >= 1.21, < 1.26; python_version >= "3.8" ++numpy >= 1.21, < 1.27; python_version >= "3.8" + + cycler < 0.11; python_version == "3.2" + pyparsing >= 1.5, < 2.4.1; python_version == "2.6" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f17f375..1561fb5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,7 @@ source: sha256: 44ae3764595778077d4bc40b0756c90f483b816927e82206e9f376e31a2dc533 patches: - fix_install_hires_instructions.patch + - fix_numpy_requirements.patch build: number: {{ build_number }}