Merge pull request #114 from regro-cf-autotick-bot/1.3.7_h742739

basemap v1.3.7
conda-forge · May 5, 2023 · 385838f · 385838f
2 parents d2063e1 + a9aac3c
commit 385838f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 26 deletions.
diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 geos:

diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 geos:

diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 geos:

diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 geos:

diff --git a/recipe/fix_numpy_requirements.patch b/recipe/fix_numpy_requirements.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,16 +1,15 @@
-{% set version = "1.3.6" %}
-{% set build_number = 3 %}
+{% set version = "1.3.7" %}
+{% set build_number = 0 %}
 
 package:
   name: basemap-split
   version: {{ version }}
 
 source:
   url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz
-  sha256: 42adbd039b4afbe93ca2fa32cfab456d4fd590cb8ed1c28e4aa94dcb957b58ac
+  sha256: 94e6207328b476f70835cb7dce5925e703114fda8b168d0e87f9cf44d69fc41c
   patches:
     - fix_install_hires_instructions.patch
-    - fix_numpy_requirements.patch
 
 build:
   number: {{ build_number }}
@@ -50,8 +49,8 @@ outputs:
         - {{ pin_subpackage('basemap-data') }}
         - {{ pin_compatible('numpy') }}
         - {{ pin_compatible('geos') }}
-        - matplotlib-base >=1.5,!=3.0.1,<3.7
-        - pyproj >=1.9.3,<3.5
+        - matplotlib-base >=1.5,<3.8
+        - pyproj >=1.9.3,<3.6
         - pyshp >=1.2.0,<2.4
     test:
       imports: