Unverified Commit 0898712b authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

4.4 Versioning Updates to dev (#4281) 



* Updates for 4.4RC (#4238)

Co-authored-by: default avatarAmy Stamile <amtamile@contractor.usgs.gov>

* Adds environment.yml changes to 4.4 (#4248)

* ISIS Recipe Changes (#4224)

* Updated recipe meta.yaml

* Updated build.sh to include jenkins kakadu area

* Updated ale version in recipe

* Updated ale version in environment.ymls

* Removed xalan-c and doxygen from meta.yml

* Adds bash script to remove the kakadu path from build.sh and runs the anaconda build command

Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>

* Updates for 4.4 Release

* Revert "Updates for 4.4 Release"

This reverts commit 6bf26a25.

* Updates for 4.4 Release

* Revert "Updates for 4.4 Release"

This reverts commit 7211b5fa.

* Versioning updates for 4.4 release

* Versioning updates for 4.4 release (#4258)

* Reverted changes to recipe/meta.yaml and recipe/build.sh

* Added host section to meta.yaml to try to fix libarmadillo error.

* update versioning in meta.yaml

* Added back DKAKADU to cmake

* Fixed bash script

* Removed duplicate Changelog header

Co-authored-by: default avatarAmy Stamile <amtamile@contractor.usgs.gov>
Co-authored-by: default avatarKaitlyn Lee <kdl222@nau.edu>
Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>
Co-authored-by: default avatarJesse Mapel <jam826@nau.edu>
parent 3fccb917

AUTHORS.rst

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ Integrated Software for Imagers and Spectrometers Contributors 
- Lee, Ella Mae

- Lee, Kaitlyn (United States Geological Survey, Astro Geology Science

  Center)

- Leggett, Rebecca (United States Geological Survey, Astro Geology

  Science Center)

- Mapel, Jesse (United States Geological Survey, Astro Geology Science

  Center)

- Milazzo, Moses
@@ -64,6 +66,8 @@ Integrated Software for Imagers and Spectrometers Contributors 
- Sides, Stuart (United States Geological Survey, Astro Geology

  Science Center)

- Silva, Victor

- Stamile, Amy (United States Geological Survey, Astro Geology Science

  Center)

- Stapleton, Summer

- Stebenne, Andrew

- Sucharski, Tracie

buildCondaRelease.sh

+3 −1
Original line number Diff line number Diff line 
sed -e 's/-DKAKADU_INCLUDE_DIR=[^[:space:]]*//' recipe/build.sh

sed -i'.backup' "s/-DKAKADU_INCLUDE_DIR=[^[:space:]]*[[:space:]]//" recipe/build.sh

conda build recipe/ -c usgs-astrogeology -c conda-forge --no-test

mv recipe/build.sh.backup recipe/build.sh

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.3.0")

set(VERSION            "4.4.0")

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

list(GET VERSION_LIST 0 VERSION_MAJOR)

list(GET VERSION_LIST 1 VERSION_MINOR)
@@ -45,7 +45,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}") 


# Other release information

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

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

set(RELEASE_STAGE             "stable") # (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")

recipe/meta.yaml

+11 −13
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.3.0_RC1" %}

{% set version = "4.4.0" %}



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

requirements:

  build:

  - cmake >=3.15

  - doxygen

  - make

  - ninja==1.7.2

  - openssl>=1.0.0,<1.1.0

  - libprotobuf=3.9.1

  - xalan-c



  host:

  - armadillo

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cmake >=3.15

  - cspice

  - curl

  - doxygen

  - eigen

  - embree

  - geos>=3.7,<3.8
@@ -77,15 +70,19 @@ requirements: 
  - kakadu==1

  - krb5

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libxml2

  - make

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - ninja==1.7.2

  - nlohmann_json

  - nn

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1

  - qhull
@@ -96,7 +93,7 @@ requirements: 
  - superlu

  - tnt

  - x264=20131218

  - xerces-c

  - xerces-c=3.1.4

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm
@@ -106,6 +103,7 @@ requirements: 


  run:

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0
@@ -138,7 +136,7 @@ requirements: 
  - superlu

  - tnt

  - x264=20131218

  - xerces-c

  - xerces-c=3.1.4

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm