Unverified Commit 0ff503c9 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Version 4.1.1 tick (#3920) 

* 4.1.1 version tick

* Ported ALE tick to 4.1 branch
parent 38ae28e7

environment.yml

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



dependencies:

  - ale >=0.8.0

  - ale >=0.8.1

  - boost=1.68.0

  - armadillo

  - blas

isis/CMakeLists.txt

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



# Version number

set(VERSION            "4.1.0")

set(VERSION            "4.1.1")

set(PACKAGE_VERSION    ${VERSION})



# Full name and version number

recipe/meta.yaml

+3 −3
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 = "4.1.0" %}

{% set version = "4.1.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
@@ -44,7 +44,7 @@ build: 
# Shotgun strat on requirements until we can narrow them down

requirements:

  build:

  - ale<0.8

  - ale >=0.8.1

  - boost=1.68.0

  - armadillo

  - blas
@@ -100,7 +100,7 @@ requirements: 
  - zlib



  run:

  - ale<0.8

  - ale >=0.8.1

  - boost=1.68.0

  - armadillo

  - blas