Unverified Commit 48846956 authored by Christine Kim's avatar Christine Kim Committed by GitHub
Browse files

Update version and build strings plus meta.yaml (#5362)

parent 72d8bedc

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ set(PACKAGE "ISIS") 
set(PACKAGE_NAME       "USGS ISIS")



# Version number

set(VERSION            "7.2.0")

set(VERSION            "8.1.0")

string(REPLACE "." ";" VERSION_LIST ${VERSION})

list(GET VERSION_LIST 0 VERSION_MAJOR)

list(GET VERSION_LIST 1 VERSION_MINOR)

recipe/meta.yaml

+8 −6
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_RC1" %}



# 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
@@ -45,8 +45,8 @@ build: 
# Shotgun strat on requirements until we can narrow them down

requirements:

  build:

   - kalasiris 

   - ale=0.9.1

   - aom

   - armadillo

   - boost=1.72

   - boost-cpp=1.72
@@ -91,6 +91,7 @@ requirements: 
   - opencv>=4.5.2

   - openssl>=1.1.1k

   - pcl >= 1.10.0

   - plio

   - protobuf<3.20

   - python>=3.7.11

   - pytest
@@ -115,9 +116,9 @@ requirements: 
   - zlib



  run:

  - kalasiris

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

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

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

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

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

  - blas
@@ -154,6 +155,7 @@ requirements: 
  - {{ pin_compatible('opencv', max_pin='x.x') }}

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

  - pcl

  - plio

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

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

  - qhull