Changes to get the meta and environment working with a pinned version…

… of ale (#3857)
DOI-USGS · May 6, 2020 · 4a304e1 · 4a304e1
1 parent 664df15
commit 4a304e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/environment.yml b/environment.yml
@@ -4,7 +4,7 @@ channels:
   - defaults
 
 dependencies:
-  - ale >=0.7.1
+  - ale<0.8.0
   - boost=1.68.0
   - armadillo
   - blas

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -44,7 +44,7 @@ build:
 # Shotgun strat on requirements until we can narrow them down
 requirements:
   build:
-  - ale >=0.7.1
+  - ale<0.8
   - boost=1.68.0
   - armadillo
   - blas
@@ -78,7 +78,7 @@ requirements:
   - nanoflann
   - nlohmann_json
   - ninja==1.7.2
-  - conda-forge/label/gcc7::nn
+  - nn
   - opencv>=3.0.0,<=4.0.0
   - openssl>=1.0.0,<1.1.0
   - pcl
@@ -100,7 +100,7 @@ requirements:
   - zlib
 
   run:
-  - ale >=0.7.1
+  - ale<0.8
   - boost=1.68.0
   - armadillo
   - blas
@@ -131,7 +131,7 @@ requirements:
   - mysql-connector-c
   - nanoflann
   - nlohmann_json
-  - conda-forge/label/gcc7::nn
+  - nn
   - opencv>=3.0.0,<=4.0.0
   - openssl>=1.0.0,<1.1.0
   - pcl