diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a21dfd3..0a7f757 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,24 +5,29 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 - timeoutInMinutes: 360 + vmImage: ubuntu-latest strategy: - maxParallel: 8 matrix: - linux_python3.6.____cpython: - CONFIG: linux_python3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.7.____cpython: - CONFIG: linux_python3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.8.____cpython: - CONFIG: linux_python3.8.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_numpy1.18python3.7.____cpython: + CONFIG: linux_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.18python3.8.____cpython: + CONFIG: linux_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.19python3.9.____cpython: + CONFIG: linux_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + timeoutInMinutes: 360 + steps: + - script: | + rm -rf /opt/ghc + df -h + displayName: Manage disk space + # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -34,7 +39,10 @@ jobs: - script: | export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) .scripts/run_docker_build.sh displayName: Run docker build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2544c76..b703ab9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,77 +5,30 @@ jobs: - job: osx pool: - vmImage: macOS-10.14 - timeoutInMinutes: 360 + vmImage: macOS-10.15 strategy: - maxParallel: 8 matrix: - osx_python3.6.____cpython: - CONFIG: osx_python3.6.____cpython - UPLOAD_PACKAGES: True - osx_python3.7.____cpython: - CONFIG: osx_python3.7.____cpython - UPLOAD_PACKAGES: True - osx_python3.8.____cpython: - CONFIG: osx_python3.8.____cpython - UPLOAD_PACKAGES: True + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.18python3.8.____cpython: + CONFIG: osx_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.9.____cpython: + CONFIG: osx_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 steps: # TODO: Fast finish on azure pipelines? - script: | - echo "Fast Finish" - - - - bash: | - echo "##vso[task.prependpath]$CONDA/bin" - sudo chown -R $USER $CONDA - displayName: Add conda to PATH - - - script: | - source activate base - conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build - displayName: 'Add conda-forge-ci-setup=2' - - - script: | - echo "Mangling homebrew from Azure to avoid conflicts." - source activate base - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k - displayName: Mangle homebrew - - - script: | - source activate base - echo "Configuring conda." - - setup_conda_rc ./ "./recipe" ./.ci_support/${CONFIG}.yaml export CI=azure - source run_conda_forge_build_setup - conda update --yes --quiet --override-channels -c conda-forge -c defaults --all - env: { - OSX_FORCE_SDK_DOWNLOAD: "1" - } - displayName: Configure conda and conda-build - - - script: | - source activate base - mangle_compiler ./ "./recipe" ./.ci_support/${CONFIG}.yaml - displayName: Mangle compiler - - - script: | - source activate base - make_build_number ./ "./recipe" ./.ci_support/${CONFIG}.yaml - displayName: Generate build number clobber file - - - script: | - source activate base - conda build "./recipe" -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - displayName: Build recipe - - - script: | - source activate base + export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - upload_package ./ "./recipe" ./.ci_support/${CONFIG}.yaml - displayName: Upload package + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + ./.scripts/run_osx_build.sh + displayName: Run OSX build env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 60c9f1b..5fd91a5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -6,28 +6,22 @@ jobs: - job: win pool: vmImage: vs2017-win2016 - timeoutInMinutes: 360 strategy: - maxParallel: 4 matrix: - win_python3.6.____cpython: - CONFIG: win_python3.6.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_python3.7.____cpython: - CONFIG: win_python3.7.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_python3.8.____cpython: - CONFIG: win_python3.8.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - steps: - # TODO: Fast finish on azure pipelines? - - script: | - ECHO ON - + win_64_numpy1.18python3.7.____cpython: + CONFIG: win_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.18python3.8.____cpython: + CONFIG: win_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____cpython: + CONFIG: win_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + steps: - script: | choco install vcpython27 -fdv -y --debug condition: contains(variables['CONFIG'], 'vs2008') @@ -64,15 +58,19 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=2' # Optional + packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED # Configure the VM - - script: setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup # Configure the VM. - script: | @@ -94,17 +92,25 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 condition: not(contains(variables['CONFIG'], 'vs2008')) + - 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:*/=%" call activate base - upload_package .\ ".\recipe" .ci_support\%CONFIG%.yaml + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/linux_python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml similarity index 55% rename from .ci_support/linux_python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml index 969b911..8551697 100644 --- a/.ci_support/linux_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -9,18 +11,27 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.7.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml similarity index 55% rename from .ci_support/linux_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml index 752ae88..30f0990 100644 --- a/.ci_support/linux_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -9,18 +11,27 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.8.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml similarity index 51% rename from .ci_support/linux_python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 9ea43a8..4bd6d3c 100644 --- a/.ci_support/linux_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -9,18 +11,27 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.19' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: -- 3.6.* *_cpython +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/migrations/python38.yaml b/.ci_support/migrations/python38.yaml deleted file mode 100644 index b11022c..0000000 --- a/.ci_support/migrations/python38.yaml +++ /dev/null @@ -1,55 +0,0 @@ -migrator_ts: 1569538102 # The timestamp of when the migration was made -__migrator: - kind: - version - exclude: - - c_compiler - - vc - - cxx_compiler - migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 - bump_number: 0 - -python: - - 2.7 - - 3.6 - - 3.7 - - 3.8 - -c_compiler: - # legacy compilers for things that refuse to move - - toolchain_c # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] - # modern compilers - - gcc # [linux64] - - clang # [osx] - # non-standard arches get built with gcc - - gcc # [aarch64] - - gcc # [ppc64le] - - gcc # [armv7l] - - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -cxx_compiler: - # legacy compilers for things that refuse to move - - toolchain_cxx # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] - # modern compilers - - gxx # [linux64] - - clangxx # [osx] - - - gxx # [aarch64] - - gxx # [ppc64le] - - gxx # [armv7l] - - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -vc: # [win] - - 9 # [win] - - 14 # [win] - - 14 # [win] - - 14 # [win] diff --git a/.ci_support/osx_python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml similarity index 71% rename from .ci_support/osx_python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index 2065757..9b19b85 100644 --- a/.ci_support/osx_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '9' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,20 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '9' +- '11' geos: -- 3.8.1 +- 3.9.1 macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.7.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml similarity index 71% rename from .ci_support/osx_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 935a023..a32f7c6 100644 --- a/.ci_support/osx_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '9' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,20 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '9' +- '11' geos: -- 3.8.1 +- 3.9.1 macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.8.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml similarity index 67% rename from .ci_support/osx_python3.6.____cpython.yaml rename to .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 0d41144..ee8234f 100644 --- a/.ci_support/osx_python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '9' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,20 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '9' +- '11' geos: -- 3.8.1 +- 3.9.1 macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: -- '1.14' +- '1.19' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: -- 3.6.* *_cpython +- 3.9.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml similarity index 74% rename from .ci_support/win_python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.7.____cpython.yaml index 5fa916b..aac17aa 100644 --- a/.ci_support/win_python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -7,16 +7,19 @@ channel_targets: cxx_compiler: - vs2017 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.7.* *_cpython -vc: -- '14' +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml similarity index 74% rename from .ci_support/win_python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.8.____cpython.yaml index a666e3e..41b8560 100644 --- a/.ci_support/win_python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -7,16 +7,19 @@ channel_targets: cxx_compiler: - vs2017 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: - 3.8.* *_cpython -vc: -- '14' +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml similarity index 68% rename from .ci_support/win_python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.9.____cpython.yaml index b2f1492..d8940c8 100644 --- a/.ci_support/win_python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -7,16 +7,19 @@ channel_targets: cxx_compiler: - vs2017 geos: -- 3.8.1 +- 3.9.1 numpy: -- '1.14' +- '1.19' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 6.3.1 +- 8.0.1 python: -- 3.6.* *_cpython -vc: -- '14' +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.gitattributes b/.gitattributes index ac943c1..9060b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ bld.bat text eol=crlf .gitattributes linguist-generated=true .gitignore linguist-generated=true .travis.yml linguist-generated=true -.scripts linguist-generated=true +.scripts/* linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5f9ade5..24519db 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @dopplershift @marqh @ocefpaf @pelson \ No newline at end of file +* @dopplershift @marqh @ocefpaf @pelson @xylar \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8a4af44..71a0686 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -6,8 +6,15 @@ # benefit from the improvement. set -xeuo pipefail -export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" @@ -18,8 +25,9 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC +BUILD_CMD=build -conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -29,11 +37,38 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +( endgroup "Configuring conda" ) 2> /dev/null + +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}" + fi + conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + + # Drop into an interactive shell + /bin/bash +else + conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi + + ( endgroup "Uploading packages" ) 2> /dev/null fi +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh new file mode 100644 index 0000000..57bc95c --- /dev/null +++ b/.scripts/logging_utils.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + travis ) + echo "$1" + echo -en 'travis_fold:start:'"${1// /}"'\\r';; + github_actions ) + echo "::group::$1";; + * ) + echo "$1";; + esac +} 2> /dev/null + +function endgroup { + # End a foldable group of log lines + # Pass a single argument, quoted + + case ${CI:-} in + azure ) + echo "##[endgroup]";; + travis ) + echo -en 'travis_fold:end:'"${1// /}"'\\r';; + github_actions ) + echo "::endgroup::";; + esac +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 253723c..244ccd1 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -5,6 +5,10 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" @@ -13,6 +17,10 @@ PROVIDER_DIR="$(basename $THISDIR)" FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -41,10 +49,14 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" + fi else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -58,20 +70,33 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ - -e BINSTAR_TOKEN \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ + -e FEEDSTOCK_NAME \ + -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ + -e BINSTAR_TOKEN \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ $DOCKER_IMAGE \ bash \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( 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 new file mode 100755 index 0000000..96d0278 --- /dev/null +++ b/.scripts/run_osx_build.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash + +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" +MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} + +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +BUILD_CMD=build + +source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +conda activate base + +echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} + + + +echo -e "\n\nSetting up the condarc and mangling the compiler." +setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi + +echo -e "\n\nRunning the build setup script." +source run_conda_forge_build_setup + + + +( endgroup "Configuring conda" ) 2> /dev/null + + +echo -e "\n\nMaking the build clobber file" +make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + +conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +( startgroup "Validating outputs" ) 2> /dev/null + +validate_recipe_outputs "${FEEDSTOCK_NAME}" + +( endgroup "Validating outputs" ) 2> /dev/null + +( startgroup "Uploading packages" ) 2> /dev/null + +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index cba42cf..ed3f451 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2019, conda-forge +Copyright (c) 2015-2021, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 46bf641..c467b6c 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,15 @@ About cartopy Home: http://scitools.org.uk/cartopy -Package license: LGPL-3.0 +Package license: LGPL-3.0-or-later -Feedstock license: BSD 3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/cartopy-feedstock/blob/master/LICENSE.txt) Summary: A library providing cartographic tools for python +Development: https://github.com/SciTools/cartopy +Documentation: https://scitools.org.uk/cartopy/docs/latest/ Current build status ==================== @@ -29,66 +31,66 @@ Current build status - + - + - + - + - + - + - + - + - + @@ -97,12 +99,6 @@ Current build status - - - -
VariantStatus
linux_python3.6.____cpythonlinux_64_numpy1.18python3.7.____cpython - variant + variant
linux_python3.7.____cpythonlinux_64_numpy1.18python3.8.____cpython - variant + variant
linux_python3.8.____cpythonlinux_64_numpy1.19python3.9.____cpython - variant + variant
osx_python3.6.____cpythonosx_64_numpy1.18python3.7.____cpython - variant + variant
osx_python3.7.____cpythonosx_64_numpy1.18python3.8.____cpython - variant + variant
osx_python3.8.____cpythonosx_64_numpy1.19python3.9.____cpython - variant + variant
win_python3.6.____cpythonwin_64_numpy1.18python3.7.____cpython - variant + variant
win_python3.7.____cpythonwin_64_numpy1.18python3.8.____cpython - variant + variant
win_python3.8.____cpythonwin_64_numpy1.19python3.9.____cpython - variant + variant
Linux_ppc64le - ppc64le disabled -
Current release info @@ -119,6 +115,7 @@ Installing `cartopy` from the `conda-forge` channel can be achieved by adding `c ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `cartopy` can be installed with: @@ -189,9 +186,9 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string) back to 0. Feedstock Maintainers @@ -201,4 +198,5 @@ Feedstock Maintainers * [@marqh](https://github.com/marqh/) * [@ocefpaf](https://github.com/ocefpaf/) * [@pelson](https://github.com/pelson/) +* [@xylar](https://github.com/xylar/) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ 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 + - template: ./.azure-pipelines/azure-pipelines-win.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8f7ecca..00eeb34 100755 --- a/build-locally.py +++ b/build-locally.py @@ -7,11 +7,20 @@ import glob import subprocess from argparse import ArgumentParser +import platform def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + if ns.debug: + os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" + if ns.output_id: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + os.environ["MINIFORGE_HOME"] = os.path.join( + os.path.dirname(__file__), "miniforge3" + ) def run_docker_build(ns): @@ -19,6 +28,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -42,21 +56,40 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + elif ns.config.startswith("osx") and platform.system() == "Darwin": + if "OSX_SDK_DIR" not in os.environ: + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" + "to download the SDK automatically to '/opt/MacOSX.sdk'" + ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--debug", + action="store_true", + help="Setup debug environment using `conda debug`", + ) + p.add_argument( + "--output-id", help="If running debug, specify the output to setup." + ) ns = p.parse_args(args=args) verify_config(ns) setup_environment(ns) - run_docker_build(ns) + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) if __name__ == "__main__": diff --git a/recipe/bld.bat b/recipe/bld.bat index 50c41e0..fb76f9d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,6 +1,7 @@ set LIB=%LIBRARY_LIB%;%LIB% set LIBPATH=%LIBRARY_LIB%;%LIBPATH% set INCLUDE=%LIBRARY_INC%;%INCLUDE% +set FORCE_CYTHON=1 rmdir lib\cartopy\tests\mpl\baseline_images /s /q diff --git a/recipe/build.sh b/recipe/build.sh index 730b294..9853964 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,4 +2,10 @@ rm -rf lib/cartopy/tests/mpl/baseline_images -${PYTHON} -m pip install --no-deps --ignore-installed . +if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then + # workaround until cross-python is fixed + rm $BUILD_PREFIX/bin/python + ln -sf $PREFIX/bin/python $BUILD_PREFIX/bin/python +fi + +FORCE_CYTHON=1 ${PYTHON} -m pip install --no-deps --ignore-installed . diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 504a4e8..b6292e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,55 +1,68 @@ -{% set version = "0.18.0rc1" %} +{% set version = "0.20.0a1" %} package: name: cartopy version: {{ version }} source: - url: https://pypi.io/packages/source/C/Cartopy/Cartopy-{{ version }}.tar.gz - sha256: e98e7d8c6abe553bd92500a15ff1da749a3ebf6261520b3376c6b3c4de5cc058 + git_url: https://github.com/SciTools/cartopy.git + git_tag: ac4c14f180e2d1f8ff10c93160648574e5fcfcac build: + error_overlinking: true number: 0 - skip: True # [win and vc<14] + # compatible proj and pyproj are only available for py>=37 + skip: true # [py<37] requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - proj # [build_platform != target_platform] + - geos # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} host: - python - pip + - setuptools-scm - cython - numpy - - msinttypes # [win and vc<14] - - geos - proj + - geos run: - python - {{ pin_compatible('numpy') }} - - six - - pillow - - owslib + - shapely >=1.5.6 + - pyshp >=1.1.4 + - six >=1.3.0 - proj + - pyproj >=3.0.0 - geos - - shapely - - scipy - - pyshp - - matplotlib-base - - pyepsg - - pykdtree + # including matplotlib-base even though it's optional upstream + - matplotlib-base >=1.5.1 + - scipy >=0.10 + - ucrt # [win] test: imports: - cartopy - cartopy.mpl.geoaxes - cartopy.crs + commands: + - python -c "import cartopy.crs as ccrs; import matplotlib.pyplot as plt; ax = plt.axes(projection=ccrs.PlateCarree())" about: home: http://scitools.org.uk/cartopy - license: LGPL-3.0 - license_file: COPYING - summary: 'A library providing cartographic tools for python' + license: LGPL-3.0-or-later + license_file: + - COPYING + - COPYING.LESSER + summary: A library providing cartographic tools for python + dev_url: https://github.com/SciTools/cartopy + doc_url: https://scitools.org.uk/cartopy/docs/latest/ extra: recipe-maintainers: @@ -57,3 +70,4 @@ extra: - ocefpaf - pelson - dopplershift + - xylar