Skip to content

Commit 4f2eed8

Browse files
Changes for 9.0 (#5707)
* Updated build and run requirements with highfive * Adjusted whitespace to be consistent with previous version
1 parent ef35abd commit 4f2eed8

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

recipe/meta.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ requirements:
5858
- cspice =67
5959
- csm >=3.0.3,<3.0.4
6060
- curl >=8.4.0,<8.5
61-
- cxx-compiler=1.1.2
61+
- cxx-compiler=1.7
6262
- doxygen
6363
- eigen >=3, <4
6464
- embree >=3, <4
@@ -69,13 +69,14 @@ requirements:
6969
- graphviz
7070
- conda-forge::gsl >=2.6, <2.7
7171
- hdf5
72+
- highfive
7273
- icu
7374
- inja
7475
- jama
7576
- usgs-astrogeology::kakadu==1
7677
- kalasiris
7778
- krb5
78-
- libgdal >=3.7.0,<3.8
79+
- libgdal >=3.7,<3.8
7980
- libopencv >=4.7,<4.8
8081
- libpng >=1.6.34,<1.7
8182
- libprotobuf
@@ -86,7 +87,7 @@ requirements:
8687
- mysql
8788
- mysql-connector-c
8889
- nanoflann <1.4
89-
- nlohmann_json
90+
- nlohmann_json=3.11.2
9091
- ninja >=1.7.2,<1.8
9192
- nn
9293
- opencv >=4.7,<4.8
@@ -99,14 +100,15 @@ requirements:
99100
- pytest
100101
- rclone
101102
- qhull
102-
- qt-main=5.15.8
103+
- qt-main>=5.15.8, <5.16
103104
- qwt <6.3.0
104105
- sqlite >=3.46.0,<3.47
105106
- suitesparse <7.7.0
106107
- superlu
107108
- swig
108109
- texlive-core
109110
- tnt
111+
- usgscsm
110112
- x264
111113
- xalan-c
112114
- xerces-c >=3.2.4,<3.3.0a0
@@ -115,8 +117,7 @@ requirements:
115117
- xorg-libsm
116118
- xorg-libx11
117119
- xorg-libxi
118-
- zlib >=1.3,<1.4
119-
120+
- zlib >=1.3,<1.4.0a0
120121
run:
121122
- {{ pin_compatible('ale', max_pin='x.x.x') }}
122123
- {{ pin_compatible('armadillo', max_pin='x.x.x') }}
@@ -137,6 +138,7 @@ requirements:
137138
- geotiff
138139
- {{ pin_compatible('gsl', min_pin='x.x', max_pin='x.x.x') }}
139140
- hdf5
141+
- highfive
140142
- icu
141143
- inja
142144
- jama

0 commit comments

Comments
 (0)