Unverified Commit 3e36182e authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Adds environment.yml changes to 4.4 (#4248) 



* ISIS Recipe Changes (#4224)

* Updated recipe meta.yaml

* Updated build.sh to include jenkins kakadu area

* Updated ale version in recipe

* Updated ale version in environment.ymls

* Removed xalan-c and doxygen from meta.yml

* Adds bash script to remove the kakadu path from build.sh and runs the anaconda build command

Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>
parent 5f15d0e0

buildCondaRelease.sh

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

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

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ channels: 
  - defaults



dependencies:

  - ale >=0.8.4

  - ale >=0.8.5

  - boost=1.68.0

  - armadillo

  - blas

environment_gcc4.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ channels: 
  - defaults



dependencies:

  - ale>=0.8.4

  - ale>=0.8.5

  - boost=1.68.0

  - armadillo

  - blas

recipe/build.sh

+1 −1
Original line number Diff line number Diff line 
mkdir build

cd build

export ISISROOT=$PWD

cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis

cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis

ninja install

recipe/meta.yaml

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

requirements:

  build:

  - ale >=0.8.4

  - boost=1.68.0

  - 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

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cmake >=3.15

  - cspice

  - curl

  - eigen
@@ -69,19 +75,15 @@ 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
@@ -101,13 +103,11 @@ requirements: 
  - zlib



  run:

  - ale >=0.8.4

  - ale >=0.8.5

  - boost=1.68.0

  - armadillo

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cspice

  - curl

  - eigen
@@ -115,33 +115,24 @@ 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
@@ -151,7 +142,6 @@ requirements: 
  - xorg-libsm

  - xorg-libx11

  - xorg-libxi

  - zlib



test:

  commands: