Skip to content

Commit

Permalink
Merge pull request #122 from regro-cf-autotick-bot/1.3.9_haad069
Browse files Browse the repository at this point in the history 
basemap v1.3.9
  • Loading branch information
@molinav
molinav authored Dec 26, 2023
2 parents 57a1811 + 94e9726 commit 3e4d201
Show file tree
Hide file tree
Showing 26 changed files with 220 additions and 121 deletions.
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file

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

56 changes: 11 additions & 45 deletions .azure-pipelines/azure-pipelines-win.yml
View file

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_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.12.0
- 3.12.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.12.0
- 3.12.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.12.0
- 3.12.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.12.0
- 3.12.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions .gitignore
View file

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

20 changes: 14 additions & 6 deletions .scripts/build_steps.sh
View file

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
View file

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

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh
View file

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

17 changes: 12 additions & 5 deletions .scripts/run_osx_build.sh
View file

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

Loading

0 comments on commit 3e4d201

Please sign in to comment.