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

3.10 patch (#3822) 



* ported #3820 to 3.10

* 3.10.2 release prep

Co-authored-by: default avatarLauren Adoram-Kershner <42873279+ladoramkershner@users.noreply.github.com>
parent 341922eb

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            "3.10.1")

set(VERSION            "3.10.2")

set(PACKAGE_VERSION    ${VERSION})



# Full name and version number
@@ -41,7 +41,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}") 


# Other release information

string(TIMESTAMP VERSION_DATE "%Y-%m-%d" UTC)

set(RELEASE_STAGE             "stable") # (alpha, beta, stable)

set(RELEASE_STAGE             "beta") # (alpha, beta, stable)



# Define to the address where bug reports for this package should be sent.

set(PACKAGE_BUGREPORT  "https://github.com/USGS-Astrogeology/ISIS3/issues")

isis/tests/ColumnTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ TEST(Column, SetWidthError) { 
//Should throw an error when Alignment is Decimal and

//SetType is called with String or Integer

TEST_P(TypeError, SetTypeError) {

  QString message = "Integer or string type is not sensible if alignment is Decimal.";

  QString message = "Integer or string type is not sensible if alignment is Decimal";

  Column column;

  column.SetAlignment(Column::Decimal);

  try {
@@ -151,7 +151,7 @@ TEST_P(TypeError, SetTypeError) { 
//Should throw an error when Type is String or Integer and

//SetAllignment is called with Decimal

TEST_P(TypeError, SetAlignmentError) {

  QString message = "Decimal alignment does not make sense for integer or string values.";

  QString message = "Decimal alignment does not make sense for integer or string values";

  Column column;

  column.SetType(GetParam());

  try {

recipe/meta.yaml

+1 −1
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 = "3.10.1" %}

{% set version = "3.10.2_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