Unverified Commit 1a32f81a authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Update 4.0 branch to new build with newer ale (#3684)

* Update meta.yaml to rename conda package to isis from isis3 (#3642)

* Pin armadillo in meta.yaml (#3650)

* Update meta.yaml to rename conda package to isis from isis3

* Pin anaconda to version 9.0 in meta.yaml so it will run without a missing shared libraries error.

* Actually pin armadillo to version 8.200.0 because 9 isn't needed and we know 8.200.0 works.

* Fix gsl issue with build caused by ale update

* Unpin ale and update build number
parent c2f79420
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
# This is the build number for the current version you are building. If this is the first build of
# this version, the build number will be 0. It is incremented by 1 with every consecutive build of
# the same version.
{% set build_number = "0" %}
{% set build_number = "1" %}

package:
  name: isis
@@ -44,7 +44,7 @@ build:
# Shotgun strat on requirements until we can narrow them down
requirements:
  build:
  - ale==0.7.1
  - ale>=0.7.1
  - boost=1.68.0
  - armadillo==8.200.0
  - blas
@@ -100,7 +100,7 @@ requirements:
  - zlib

  run:
  - ale==0.7.1
  - ale>=0.7.1
  - boost=1.68.0
  - armadillo==8.200.0
  - blas