Unverified Commit 0cb42f92 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Updates dev for the 4.3RC pull/release (#4050) 

* Updates dev for the 4.3RC pull/release

* Updated the changelog for the 4.3.0 RC
parent c6fdb750

CHANGELOG.md

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ update the Unreleased link so that it compares against the latest release tag. 


## [Unreleased]



## [4.3.0] - 2020-10-02



### Changed



 - Camera models now use the ALE library to interpolate states and orientations. Users will likely see very small changes in sensor ephemerides. These were tested and are within existing interpolation tolerances. [#2370](https://github.com/USGS-Astrogeology/ISIS3/issues/2370)
@@ -231,7 +233,8 @@ The unreleased comparison should always be 
{REPO_NAME}/compare/{LAST_VERSION_TAG}...HEAD

-->



[unreleased]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.2.0...HEAD

[unreleased]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.3.0...HEAD

[4.3.0]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.2.0...4.3.0

[4.2.0]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.1.1...4.2.0

[4.1.1]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.1.0...4.1.1

[4.1.0]: https://github.com/USGS-Astrogeology/ISIS3/compare/4.0.1...4.1.0

environment.yml

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



dependencies:

  - ale >=0.8.1

  - ale >=0.8.4

  - 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.0

  - ale>=0.8.4

  - boost=1.68.0

  - armadillo

  - blas

isis/CMakeLists.txt

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



# Version number

set(VERSION            "4.1.0")

set(VERSION            "4.3.0")

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

list(GET VERSION_LIST 0 VERSION_MAJOR)

list(GET VERSION_LIST 1 VERSION_MINOR)

recipe/meta.yaml

+7 −7
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.2.0" %}

{% set version = "4.3.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
@@ -47,7 +47,7 @@ requirements: 
  build:

  - ale >=0.8.4

  - boost=1.68.0

  - armadillo==8.200.0

  - armadillo

  - blas

  - bullet=2.86.1=0

  - bz2file
@@ -80,7 +80,7 @@ requirements: 
  - nlohmann_json

  - ninja==1.7.2

  - nn

  - opencv=3.2.0

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1
@@ -101,9 +101,9 @@ requirements: 
  - zlib



  run:

  - ale >=0.8.1

  - ale >=0.8.4

  - boost=1.68.0

  - armadillo==8.200.0

  - armadillo

  - blas

  - bullet=2.86.1=0

  - bz2file
@@ -133,7 +133,7 @@ requirements: 
  - nanoflann

  - nlohmann_json

  - nn

  - opencv=3.2.0

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1