Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fiona v1.8.5 #122

Merged
merged 3 commits into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
8 changes: 5 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# -*- mode: yaml -*-

jobs:
- job: linux_64
- job: linux
pool:
vmImage: ubuntu-16.04
timeoutInMinutes: 240
Expand All @@ -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
displayName: Run docker build
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
4 changes: 3 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# -*- mode: yaml -*-

jobs:
- job: osx_64
- job: osx
pool:
vmImage: macOS-10.13
timeoutInMinutes: 240
Expand Down Expand Up @@ -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'))
21 changes: 15 additions & 6 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# -*- mode: yaml -*-

jobs:
- job: win_64
- job: win
pool:
vmImage: vs2017-win2016
timeoutInMinutes: 240
Expand Down Expand Up @@ -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'))
4 changes: 4 additions & 0 deletions .ci_support/linux_python2.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python3.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% set version = "1.8.4" %}
{% set version = "1.8.5" %}

package:
name: fiona
version: {{ version }}

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
Expand Down Expand Up @@ -49,6 +49,7 @@ test:
- boto3 >=1.2.4
- packaging
- pytest-catchlog
- mock # [py2k]
files:
- test_data
commands:
Expand Down