From 4cdcc411f632add89517c00832a817ea2b3bcc09 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Sat, 16 Mar 2019 05:27:31 +0000 Subject: [PATCH 1/3] updated v1.8.5 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 543f1f8..a506402 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.4" %} +{% set version = "1.8.5" %} package: name: fiona @@ -6,10 +6,10 @@ package: source: url: https://pypi.io/packages/source/F/Fiona/Fiona-{{ version }}.tar.gz - sha256: aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424 + sha256: 4f5cc2d449edbbf693c83e24cdada72de7c41297383d16fcc92387eb445e9d35 build: - number: 1002 + number: 0 skip: True # [win and vc<14] entry_points: - fio = fiona.fio.main:main_group From 790ede2f5d9ae6ae7a96a57de8a25e9673d318b8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Sat, 16 Mar 2019 05:27:43 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.03.14 --- .appveyor.yml | 2 +- .azure-pipelines/azure-pipelines-linux.yml | 8 +++++--- .azure-pipelines/azure-pipelines-osx.yml | 4 +++- .azure-pipelines/azure-pipelines-win.yml | 21 +++++++++++++++------ .ci_support/linux_python2.7.yaml | 4 ++++ .ci_support/linux_python3.6.yaml | 4 ++++ .ci_support/linux_python3.7.yaml | 4 ++++ .ci_support/osx_python2.7.yaml | 4 ++++ .ci_support/osx_python3.6.yaml | 4 ++++ .ci_support/osx_python3.7.yaml | 4 ++++ 10 files changed, 48 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3fb65a7..6882006 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" + "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index eb9811e..7ac96fd 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: linux_64 +- job: linux pool: vmImage: ubuntu-16.04 timeoutInMinutes: 240 @@ -28,10 +28,12 @@ jobs: # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | - docker run --rm --privileged multiarch/qemu-user-static:register + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes ls /proc/sys/fs/binfmt_misc/ condition: not(startsWith(variables['CONFIG'], 'linux_64')) displayName: Configure binfmt_misc - script: .azure-pipelines/run_docker_build.sh - displayName: Run docker build \ No newline at end of file + displayName: Run docker build + env: + BINSTAR_TOKEN: $(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 756bdbb..35efd7c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: osx_64 +- job: osx pool: vmImage: macOS-10.13 timeoutInMinutes: 240 @@ -87,4 +87,6 @@ jobs: set -x -e upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 74c3b51..14640cf 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: win_64 +- job: win pool: vmImage: vs2017-win2016 timeoutInMinutes: 240 @@ -77,20 +77,29 @@ jobs: displayName: conda-forge build setup + - script: | + rmdir C:\strawberry /s /q + continueOnError: true + displayName: remove strawberryperl + # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + conda.exe build recipe -m .ci_support\%CONFIG%.yaml displayName: Build recipe (vs2008) - env: { - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin", - } + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + conda.exe build recipe -m .ci_support\%CONFIG%.yaml displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index 0497e80..3f808da 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,11 +1,15 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - gxx +cxx_compiler_version: +- '7' docker_image: - condaforge/linux-anvil-comp7 gdal: diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index b830aab..785e795 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,11 +1,15 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - gxx +cxx_compiler_version: +- '7' docker_image: - condaforge/linux-anvil-comp7 gdal: diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index af88867..7864a4e 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,11 +1,15 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - gxx +cxx_compiler_version: +- '7' docker_image: - condaforge/linux-anvil-comp7 gdal: diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index 0711c8f..79a1cf1 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' gdal: - '2.4' macos_machine: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index 43c1ee1..fd8d0b5 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' gdal: - '2.4' macos_machine: diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index fecdd85..f493e2f 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' gdal: - '2.4' macos_machine: From ddd5d8e6d4345f5248b59b17aa199bf11c3330f9 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 17 Mar 2019 09:24:23 -0300 Subject: [PATCH 3/3] add mock --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a506402..f61345d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,6 +49,7 @@ test: - boto3 >=1.2.4 - packaging - pytest-catchlog + - mock # [py2k] files: - test_data commands: