Update proj pin

The cartopy package that worked with proj 7.0.0 was marked as broken because proj wasn't being explicitly pinned to a compatible version (conda-forge/cartopy-feedstock#93). As a result, there is no build of cartopy 0.18.0 that works with proj 7.0.0.
E3SM-Project · Oct 28, 2020 · 623a495 · 623a495
1 parent bac197c
commit 623a495
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/recipes/e3sm-unified/build_and_upload.bash b/recipes/e3sm-unified/build_and_upload.bash
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+rm -rf ~/miniconda3/conda-bld
+
 conda build --override-channels -c conda-forge -c defaults -c e3sm .
 
 upload=False

diff --git a/recipes/e3sm-unified/meta.yaml b/recipes/e3sm-unified/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "E3SM-Unified" %}
 {% set version = "1.3.1.2" %}
-{% set build = 2 %}
+{% set build = 3 %}
 
 package:
   name: {{ name|lower }}
@@ -61,8 +61,7 @@ requirements:
     - lxml
     - sympy
     - pyproj 2.6.1.post1
-    # can't bump until rasterio issue gets fixed
-    - proj 7.0.0
+    - proj 7.1.1
     - pytest
     - shapely
     - cartopy