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

Version Ticks for 7.2.0 RC Candidate (#5094) 

* Updated Code.json

* More ticks for 7.2.0_RC

* Updated AUTHORS.rst

* Updated meta.yaml dependencies

* Fixed spacing on dependency

* Pinned ALE

* Put x256 back into the recipe meta.yml file

* Correctly pinned ALE in the recipe

* Pinned armadillo version in run section

* Clamped gsl to only 2.6 versions

* Pinned to new numpy version

* Further pinned numpy in build script

* Reduced numpy dep to 1.23
parent 7d6aced3

AUTHORS.rst

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ Integrated Software for Imagers and Spectrometers Contributors 
- Bonn, John

- Boyd, Mackenzie

- Brownsberger, Sasha

- Cain, Jacob (United States Geological Survey, Astro Geology Science

  Center)

- Chaves, Pat

- Christensen, Way

- Clark, Roger (United States Geological Survey)
@@ -71,6 +73,7 @@ Integrated Software for Imagers and Spectrometers Contributors 
- Herkenhoff, Ken (United States Geological Survey, Astro Geology

  Science Center)

- Heyer, Eric

- Hibl, Anton

- Hilt, Noah

- Howington-Kraus, Elpitha

- Humphrey, Ian

CHANGELOG.md

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,16 @@ release. 


## [Unreleased]



### Changed



### Added



### Deprecated



### Fixed



## [7.2.0] - 2022-12-07



### Changed

- Updated Hayabusa2 mission name and updated translation files to make L2DShapeModelFileName, L2DPhaseFunctionFileName, L2CShapeModelFileName, and BandRegistration optional keywords.

buildCondaRelease.sh

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

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

conda build recipe/ -c conda-forge -c usgs-astrogeology --numpy=1.23

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

code.json

+46 −1
Original line number Diff line number Diff line 
[

  {

    "name": "ISIS3",

    "organization": "U.S. Geological Survey",

    "description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",

    "version": "7.2.0",

    "status": "Release",



    "permissions": {

      "usageType": "openSource",

      "licenses": [

        {

          "name": "Public Domain, CC0-1.0",

          "URL": "https://code.usgs.gov/astrogeology/isis/-/blob/7.2.0/LICENSE.md"

        }

      ]

    },



    "homepageURL": "https://isis.astrogeology.usgs.gov",

    "downloadURL": "https://code.usgs.gov/astrogeology/isis/-/tree/7.2.0",

    "disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/blob/7.2.0/DISCLAIMER.md",

    "repositoryURL": "https://code.usgs.gov/astrogeology/isis",

    "vcs": "git",



    "laborHours": 2400,



    "tags": [

      "Planetary",

      "Remote Sensing",

      "Photogrammetry",

      "Data Processing"

    ],



    "languages": [

      "C++"

    ],



    "contact": {

      "name": "Dr. Jason Laura",

      "email": "jlaura@usgs.gov"

    },



    "date": {

      "metadataLastUpdated": "2023-02-21"

    }

  },

  {

    "name": "ISIS3",

    "organization": "U.S. Geological Survey",
@@ -85,7 +130,7 @@ 
    },



    "date": {

      "metadataLastUpdated": "2022-02-08"

      "metadataLastUpdated": "2022-12-07"

    }

  }

]

isis/CMakeLists.txt

+2 −2
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.0.0")

set(VERSION            "7.2.0")

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

list(GET VERSION_LIST 0 VERSION_MAJOR)

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


# Other release information

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

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