Commit 339a5488 authored by acpaquette's avatar acpaquette
Browse files

Refined environment.yml and meta.yml

parent afe79da2

environment.yml

+12 −12
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ dependencies: 
  - kalasiris 

  - ale>=0.10.0, <1

  - armadillo

  - boost=1.72.0, <2

  - boost-cpp=1.72.0, <2

  - boost=1.72.0, <1.73

  - boost-cpp=1.72.0, <1.73

  - blas

  - usgs-astrogeology::bullet

  - bz2file

  - bzip2

  - cmake >=3.15, <4

  - cmake >=3.27, <3.28

  - cspice=67

  - csm>=3.0.3,<3.0.4

  - curl
@@ -25,7 +25,7 @@ dependencies: 
  - geotiff

  - gmp

  - graphviz

  - gsl>=2.6, <3

  - conda-forge::gsl>=2.6, <3

  - hdf5

  - icu

  - inja
@@ -34,10 +34,10 @@ dependencies: 
  - usgs-astrogeology::kakadu==1

  - krb5

  - libcxx=16

  - libopencv>=4.5.2, <5

  - libpng>=1.6.34, <2

  - libprotobuf<3.20, <4

  - libtiff>=4.0, <5

  - libopencv>=4.5.2, <4.6

  - libpng>=1.6.34, <1.7

  - libprotobuf<3.20

  - libtiff>=4.4, <4.5

  - libxml2

  - make

  - mesalib
@@ -47,16 +47,16 @@ dependencies: 
  - nlohmann_json

  - ninja==1.7.2

  - nn

  - opencv>=4.5.2, <5

  - opencv>=4.5.2, <4.6

  - openssl>=1.1.1k, <2

  - pcl >= 1.10.0, <2

  - pcl >= 1.11.0, <1.12

  - plio

  - protobuf<3.20, <4

  - protobuf<3.20

  - python>=3.9

  - pytest

  - rclone

  - qhull

  - qt>=5.9.6,<5.15.0

  - qt>=5.12.9,<5.13

  - qwt

  - sqlite

  - suitesparse

recipe/meta.yaml

+21 −19
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.1.0" %}

{% set version = "8.1" %}



# 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
@@ -27,7 +27,7 @@ 


package:

  name: isis

  version: {{ version }}

  version: {{ version }}.0_RC3



source:

  git_url: 'https://github.com/DOI-USGS/ISIS3.git'
@@ -46,15 +46,15 @@ build: 
requirements:

  build:

   - kalasiris 

   - ale=0.10.0

   - ale>=0.10.0, <1

   - armadillo

   - boost=1.72

   - boost-cpp=1.72

   - boost=1.72.0, <1.73

   - boost-cpp=1.72.0, <1.73

   - blas

   - usgs-astrogeology::bullet

   - bz2file

   - bzip2

   - cmake >=3.15

   - cmake >=3.27, <3.28

   - cspice=67

   - csm>=3.0.3,<3.0.4

   - curl
@@ -67,7 +67,7 @@ requirements: 
   - geotiff

   - gmp

   - graphviz

   - gsl>=2.6,<2.7

   - conda-forge::gsl>=2.7, <2.8

   - hdf5

   - icu

   - inja
@@ -75,10 +75,11 @@ requirements: 
   - jpeg

   - usgs-astrogeology::kakadu==1

   - krb5

   - libopencv>=4.5.2

   - libpng>=1.6.34

   - libcxx=16

   - libopencv>=4.5.2, <4.6

   - libpng>=1.6.34, <1.7

   - libprotobuf<3.20

   - libtiff>=4.0

   - libtiff>=4.4, <4.5

   - libxml2

   - make

   - mesalib
@@ -88,19 +89,19 @@ requirements: 
   - nlohmann_json

   - ninja==1.7.2

   - nn

   - opencv>=4.5.2

   - openssl>=1.1.1k

   - pcl >=1.10.0

   - opencv>=4.5.2, <4.6

   - openssl>=1.1.1k, <2

   - pcl >= 1.11.0, <1.12

   - plio

   - protobuf<3.20

   - python>=3.7.11

   - python>=3.9

   - pytest

   - rclone

   - qhull

   - qt>=5.9.6,<5.15.0

   - qwt

   - qt>=5.12.9,<5.13

   - qwt<6.3.0

   - sqlite

   - suitesparse

   - suitesparse<7.7.0

   - superlu

   - swig

   - texlive-core
@@ -133,7 +134,7 @@ requirements: 
  - {{ pin_compatible('geos', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('geotiff', max_pin='x.x') }}

  - geotiff

  - {{ pin_compatible('gsl', min_pin='x.x', max_pin='x.x.x') }}

  - {{ pin_compatible('conda-forge::gsl', min_pin='x.x', max_pin='x.x.x') }}

  - hdf5

  - icu

  - inja
@@ -162,6 +163,7 @@ requirements: 
  - {{ pin_compatible('qt', max_pin='x.x') }}

  - {{ pin_compatible('qwt', max_pin='x.x') }}

  - rclone

  - {{ pin_compatible('suitesparse', min_pin='x.x', max_pin='x.x') }}

  - superlu

  - tnt

  - x264