Unverified Commit 3d571a16 authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

4.4 meta.yaml changes (#4277) 



* Versioning updates for 4.4 release

* Reverted changes to recipe/meta.yaml and recipe/build.sh

* Added host section to meta.yaml to try to fix libarmadillo error.

* update versioning in meta.yaml

* Added back DKAKADU to cmake

* Fixed bash script

Co-authored-by: default avatarKaitlyn Lee <kdl222@nau.edu>
parent c40772da

buildCondaRelease.sh

+2 −1
Original line number Diff line number Diff line 
sed -e 's/-DKAKADU_INCLUDE_DIR=[^[:space:]]*//' recipe/build.sh

sed -i'.backup' "s/-DKAKADU_INCLUDE_DIR=[^[:space:]]*[[:space:]]//" recipe/build.sh

conda build recipe/ -c usgs-astrogeology -c conda-forge --no-test

mv recipe/build.sh.backup recipe/build.sh

recipe/meta.yaml

+20 −10
Original line number Diff line number Diff line
@@ -45,20 +45,14 @@ build: 
# Shotgun strat on requirements until we can narrow them down

requirements:

  build:

  - cmake >=3.15

  - make

  - ninja==1.7.2

  - openssl>=1.0.0,<1.1.0

  - libprotobuf=3.9.1



  host:

  - armadillo

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cmake >=3.15

  - cspice

  - curl

  - eigen
@@ -75,15 +69,19 @@ requirements: 
  - kakadu==1

  - krb5

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libxml2

  - make

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - nlohmann_json

  - ninja==1.7.2

  - nn

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1

  - qhull
@@ -94,7 +92,7 @@ requirements: 
  - superlu

  - tnt

  - x264=20131218

  - xerces-c

  - xerces-c=3.1.4

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm
@@ -104,10 +102,12 @@ requirements: 


  run:

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cspice

  - curl

  - eigen
@@ -115,33 +115,43 @@ requirements: 
  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gmp

  - gsl>=2.6

  - hdf5

  - icu

  - jama

  - jpeg==9b

  - kakadu==1

  - krb5

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libxml2

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - nlohmann_json

  - nn

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1

  - qhull

  - qt=5.9.6

  - qwt=6.1.3

  - sqlite

  - suitesparse

  - superlu

  - tnt

  - x264=20131218

  - xerces-c

  - xerces-c=3.1.4

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm

  - xorg-libx11

  - xorg-libxi

  - zlib



test:

  commands: