Skip to content

Commit

Permalink
Merge pull request #117 from regro-cf-autotick-bot/1.3.8_hf6c5a3
Browse files Browse the repository at this point in the history
basemap v1.3.8
  • Loading branch information
molinav authored Aug 22, 2023
2 parents 385838f + aeb4cca commit 57a1811
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 34 deletions.
5 changes: 0 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

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.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/geos3112.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.11.2
- 3.12.0
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.11.2
- 3.12.0
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.11.2
- 3.12.0
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
geos:
- 3.11.2
- 3.12.0
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
geos:
- 3.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
geos:
- 3.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
geos:
- 3.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
geos:
- 3.11.2
- 3.12.0
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

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

4 changes: 4 additions & 0 deletions README.md

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

16 changes: 8 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.3.7" %}
{% set version = "1.3.8" %}
{% set build_number = 0 %}

package:
Expand All @@ -7,14 +7,14 @@ package:

source:
url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz
sha256: 94e6207328b476f70835cb7dce5925e703114fda8b168d0e87f9cf44d69fc41c
sha256: 50e3522ce56e674eeb6dc299970a719ff280c6d3329e1661e290b379dd931113
patches:
- fix_install_hires_instructions.patch

build:
number: {{ build_number }}
skip: true # [s390x] Missing dependencies.
skip: true # [win32] Missing dependencies in win32 arch and not expecting they will be updated.
skip: true # [s390x] # Missing dependencies.
skip: true # [win32] # Missing dependencies in win32 arch and not expecting they will be updated.
skip: true # [python_impl == 'pypy']

requirements:
Expand All @@ -25,20 +25,20 @@ requirements:
outputs:

- name: basemap
script: build-basemap.sh # [not win] This script will delete `pyproject.toml`. Remove ASAP.
script: bld-basemap.bat # [win] This script will delete `pyproject.toml`. Remove ASAP.
script: build-basemap.sh # [not win] # This script will delete `pyproject.toml`. Remove ASAP.
script: bld-basemap.bat # [win] # This script will delete `pyproject.toml`. Remove ASAP.
build:
skip: true # [python_impl == 'pypy']
requirements:
build:
- python
- cython >=0.29,<3.1
- cython >=0.29,<3.0
- {{ compiler('c') }}
- {{ compiler('cxx') }}
host:
- python
- pip
- cython >=0.29,<3.1
- cython >=0.29,<3.0
- numpy >=1.21
- geos
- pyproj
Expand Down

0 comments on commit 57a1811

Please sign in to comment.