Skip to content

Rebuild for gdal31 #89

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.

Sign up for GitHub

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

Merged
ocefpaf merged 2 commits into from
May 18, 2020
Merged

Rebuild for gdal31 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac804ba
Rebuild for gdal31
May 18, 2020
2801814
MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.2, and con…
May 18, 2020
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
15 changes: 9 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler_version:
docker_image:
- condaforge/linux-anvil-comp7
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler_version:
docker_image:
- condaforge/linux-anvil-comp7
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler_version:
docker_image:
- condaforge/linux-anvil-comp7
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
7 changes: 7 additions & 0 deletions .ci_support/migrations/gdal31.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
gdal:
- '3.1'
migrator_ts: 1589741512.6218328
23 changes: 0 additions & 23 deletions .ci_support/migrations/proj700.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '9'
gdal:
- '3.0'
- '3.1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '9'
gdal:
- '3.0'
- '3.1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '9'
gdal:
- '3.0'
- '3.1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2017
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2017
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2017
gdal:
- '3.0'
- '3.1'
numpy:
- '1.14'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:

build:
skip: true # [win and vc<14]
number: 0
number: 1

requirements:
build:
Expand Down