Commit a6595b9f authored by acpaquette's avatar acpaquette Committed by acpaquette
Browse files

Pinned embree in env and recipe due to new major version tick in conda-forge (#5128)

parent 26722438

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ dependencies: 
  - cxx-compiler=1.1.2

  - doxygen

  - eigen < 3.4

  - embree

  - embree>=2.17,<3

  - ffmpeg

  - geos>=3.7,<3.8

  - geotiff

recipe/meta.yaml

+4 −2
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ requirements: 
   - curl

   - doxygen

   - eigen<3.4

   - embree

   # versioned due to major release of embree 3 on conda-forge

   # it is not compatible without changes to ISIS

   - embree>=2.17, <3

   - ffmpeg

   - geos>=3.7,<3.8

   - geotiff
@@ -127,7 +129,7 @@ requirements: 
  - cspice

  - curl

  - eigen

  - embree

  - {{ 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('geotiff', max_pin='x.x') }}