Commit cb7c5cf2 authored by acpaquette's avatar acpaquette
Browse files

Updated envs again

parent 416f2662

environment.yml

+8 −8
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ dependencies: 
  - kalasiris 

  - ale>=0.10.0, <1

  - armadillo

  - boost=1.72.0, <1.73

  - boost-cpp=1.72.0, <1.73

  - boost>=1.72.0, <1.73

  - boost-cpp>=1.72.0, <1.73

  - blas

  - usgs-astrogeology::bullet

  - bz2file
@@ -25,7 +25,7 @@ dependencies: 
  - geotiff

  - gmp

  - graphviz

  - conda-forge::gsl>=2.6, <3

  - conda-forge::gsl>=2.6, <2.7

  - hdf5

  - icu

  - inja
@@ -57,9 +57,9 @@ dependencies: 
  - rclone

  - qhull

  - qt>=5.12.9,<5.13

  - qwt

  - qwt<6.3.0

  - sqlite

  - suitesparse

  - suitesparse<7.7.0

  - superlu

  - swig

  - texlive-core

recipe/meta.yaml

+6 −6
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ requirements: 
   - kalasiris 

   - ale>=0.10.0, <1

   - armadillo

   - boost=1.72.0, <1.73

   - boost-cpp=1.72.0, <1.73

   - boost>=1.72.0, <1.73

   - boost-cpp>=1.72.0, <1.73

   - blas

   - usgs-astrogeology::bullet

   - bz2file
@@ -67,7 +67,7 @@ requirements: 
   - geotiff

   - gmp

   - graphviz

   - conda-forge::gsl>=2.7, <2.8

   - conda-forge::gsl>=2.6, <2.7

   - hdf5

   - icu

   - inja
@@ -131,7 +131,7 @@ requirements: 
  - eigen

  - {{ pin_compatible('embree', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('ffmpeg', min_pin='x.x') }}

  - {{ pin_compatible('geos', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('geos', min_pin='x.x.x', max_pin='x.x.x') }}

  - {{ pin_compatible('geotiff', max_pin='x.x') }}

  - geotiff

  - {{ pin_compatible('conda-forge::gsl', min_pin='x.x', max_pin='x.x.x') }}