Unverified Commit 17fe70dd authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Update Build Recipe (#5407) 

* 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
parent 9d7f2139

buildCondaRelease.sh

+1 −1
Original line number Diff line number Diff line 
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

recipe/meta.yaml

+35 −34
Original line number Diff line number Diff line
@@ -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
@@ -48,37 +48,38 @@ requirements: 
   - 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

   - cmake >=3.15,<4

   - cspice =67

   - csm >=3.0.3,<3.0.4

   - curl

   - cxx-compiler=1.1.2

   - 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

   - 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
@@ -86,19 +87,21 @@ requirements: 
   - mysql-connector-c

   - 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
@@ -106,13 +109,13 @@ requirements: 
   - 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') }}
@@ -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
@@ -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