Skip to content

Commit

Permalink
Pinned embree in env and recipe due to new major version tick in cond…
Browse files Browse the repository at this point in the history
…a-forge (#5128)
  • Loading branch information
acpaquette committed Mar 3, 2023
1 parent 2672243 commit a6595b9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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') }}
Expand Down

0 comments on commit a6595b9

Please sign in to comment.