Skip to content

Commit

Permalink
Update Build Recipe (#5407)
Browse files Browse the repository at this point in the history
* Updated meta.yml

* Fixed spacing in meta.yml

* Fixed more spacing and missing less than signs

* Set pcl to 1.14

* Further pinned pcl

* Fixed errant single quote

* Lowered minimum pcl version

* Open python version

* Pinned python again and opened up compiler version

* Removed jpeg and vtk

* Removed jpeg from run section

* Removed set numpy version

* Reset source and version
  • Loading branch information
acpaquette authored Jan 18, 2024
1 parent 9d7f213 commit 17fe70d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 35 deletions.
2 changes: 1 addition & 1 deletion buildCondaRelease.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sed -i'.backup' "s/-DKAKADU_INCLUDE_DIR=[^[:space:]]*[[:space:]]//" recipe/build.sh
conda build recipe/ -c conda-forge -c usgs-astrogeology --numpy=1.22
conda build recipe/ -c conda-forge -c usgs-astrogeology
mv recipe/build.sh.backup recipe/build.sh


69 changes: 35 additions & 34 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# A Public Release for ISIS3.6.1: {% set version = "3.6.1" %}
# A Release Candidate for ISIS3.6.1: {% set version = "3.6.1_RC" %}
# A custom build of ISIS3.6.1 for the CaSSIS mission: {% set version = "3.6.1_cassis" %}
{% set version = "8.0.0_RC1" %}
{% set version = "8.1.0_RC2" %}

# 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
Expand All @@ -45,74 +45,77 @@ build:
# Shotgun strat on requirements until we can narrow them down
requirements:
build:
- ale=0.10.0
- ale =0.10.0
- aom
- armadillo
- boost=1.72
- boost-cpp=1.72
- boost >=1.72.0,<2
- boost-cpp >=1.72.0,<2
- blas
- usgs-astrogeology::bullet
- bz2file
- bzip2
- cmake>=3.15
- cspice=67
- csm>=3.0.3,<3.0.4
- curl
- cxx-compiler=1.1.2
- cmake >=3.15,<4
- cspice =67
- csm >=3.0.3,<3.0.4
- curl >=8.3.0,<9.0a0
- cxx-compiler >=1.1.2
- doxygen
- eigen<3.4
- embree>=2.17,<3
- eigen >=3, <4
- embree >=3, <4
- ffmpeg
- geos =3.11.1
- geos >=3.12.1, <4
- geotiff
- gmp
- graphviz
- gsl>=2.6
- hdf5
- gsl >=2.6
- hdf5 >=1.14.2,<1.14.3.0a0
- icu
- inja
- jama
- jpeg
- usgs-astrogeology::kakadu==1
- krb5
- libopencv>=4.5.2
- libpng>=1.6.34
- libprotobuf<3.20
- libtiff>=4.0
- libboost >=1.72.0,<2
- libgdal >=3.7.2,<3.8.0a0
- libopencv >=4.5.2,<5
- libpng >=1.6.34,<2
- libprotobuf
- libtiff >=4.0,<5
- libxml2
- make
- mesalib
- mysql
- mysql-connector-c
- nanoflann<1.4
- nanoflann <1.4
- nlohmann_json
- ninja==1.7.2
- ninja >=1.7.2,<2
- nn
- opencv>=4.5.2
- openssl>=1.1.1k
- pcl>=1.10.0
- protobuf<3.20
- python>=3.7.11
- opencv >=4.5.2,<5
- openssl >=3.1.2,<4.0a0
- pcl >=1.10,<2
- plio
- protobuf
- python >=3.11
- python_abi >=3.11
- pytest
- rclone
- qhull
- qt>=5.9.6,<5.15.0
- qt-main
- qwt
- sqlite
- sqlite >=3.43.0,<4.0a0
- suitesparse
- superlu
- swig
- texlive-core
- tnt
- x264
- xalan-c
- xerces-c=3
- xerces-c >=3.2.4,<3.3.0a0
- xorg-kbproto
- xorg-libice
- xorg-libsm
- xorg-libx11
- xorg-libxi
- zlib
- zlib >=1.2.13,<1.3.0a0

run:
- {{ pin_compatible('ale', max_pin='x.x.x') }}
Expand All @@ -138,7 +141,6 @@ requirements:
- inja
- jama
- {{ pin_compatible('jasper', max_pin='x.x') }}
- {{ pin_compatible('jpeg', max_pin='x') }}
- {{ pin_compatible('kakadu', max_pin='x') }}
- libcxx
- libopenblas
Expand All @@ -150,10 +152,9 @@ requirements:
- nanoflann
- nlohmann_json
- nn
- {{ pin_compatible('numpy', max_pin='x.x') }}
- {{ pin_compatible('opencv', max_pin='x.x') }}
- {{ pin_compatible('openssl', min_pin='x', max_pin='x.x') }}
- pcl
- {{ pin_compatible('pcl', min_pin='x', max_pin='x.x') }}
- {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }}
- {{ pin_compatible('protobuf', max_pin='x.x') }}
- qhull
Expand Down Expand Up @@ -183,4 +184,4 @@ about:
home: https://github.com/USGS-Astrogeology/ISIS3
license: CC0-1.0
license_file: LICENSE.md
summary: "Integrated Software for Imagers and Spectrometers"
summary: "Integrated Software for Imagers and Spectrometers"

0 comments on commit 17fe70d

Please sign in to comment.