From 73c05f9fbfe19a2faa9107c9936f1aeb8e9bf22f Mon Sep 17 00:00:00 2001 From: Christine Kim <125395064+chkim-usgs@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:08:20 -0400 Subject: [PATCH] 8.3.0 Release Prep (#5623) * Update docs * Update more docs --- CHANGELOG.md | 2 +- code.json | 14 +++++++------- isis/CMakeLists.txt | 2 +- recipe/meta.yaml | 13 +++++++------ 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aba827254e..d56d7f169d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ release. ## [Unreleased] -## [8.3.0] - 2024-08-16 +## [8.3.0] - 2024-09-30 ### Added - Added backplane options for SunIllumination and SurfaceObliqueDetectorResolution to phocube [#5467](https://github.com/DOI-USGS/ISIS3/issues/5467) diff --git a/code.json b/code.json index da3b2eba98..015bea6261 100644 --- a/code.json +++ b/code.json @@ -91,7 +91,7 @@ "name": "ISIS3", "organization": "U.S. Geological Survey", "description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)", - "version": "8.3.0_RC1", + "version": "8.3.0", "status": "Production", "permissions": { @@ -99,14 +99,14 @@ "licenses": [ { "name": "Public Domain, CC0-1.0", - "URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.3.0_RC1/LICENSE.md" + "URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.3.0/LICENSE.md" } ] }, "homepageURL": "https://isis.astrogeology.usgs.gov", - "downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.3.0_RC1/8.3.0_RC1.zip", - "disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.3.0_RC1/DISCLAIMER.md", + "downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.3.0/8.3.0.zip", + "disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.3.0/DISCLAIMER.md", "repositoryURL": "https://code.usgs.gov/astrogeology/isis.git", "vcs": "git", @@ -124,12 +124,12 @@ ], "contact": { - "name": "Adam Paquette", - "email": "acpaquette@usgs.gov" + "name": "Christine", + "email": "chkim@usgs.gov" }, "date": { - "metadataLastUpdated": "2024-08-16" + "metadataLastUpdated": "2024-09-30" } } ] diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index f8d1ad3eb3..f84759c069 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -46,7 +46,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") diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aebf9edd3d..f0abbe3e80 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ package: name: isis - version: {{ version }}.0_RC1 + version: {{ version }}.0 source: git_url: 'https://github.com/DOI-USGS/ISIS3.git' @@ -58,7 +58,7 @@ requirements: - cspice =67 - csm >=3.0.3,<3.0.4 - curl >=8.4.0,<8.5 - - cxx-compiler=1.1.2 + - cxx-compiler=1.7 - doxygen - eigen >=3, <4 - embree >=3, <4 @@ -86,7 +86,7 @@ requirements: - mysql - mysql-connector-c - nanoflann <1.4 - - nlohmann_json + - nlohmann_json=3.11.2 - ninja >=1.7.2,<1.8 - nn - opencv >=4.7,<4.8 @@ -99,7 +99,7 @@ requirements: - pytest - rclone - qhull - - qt-main=5.15.8 + - qt-main >=5.15.8,<5.16 - qwt <6.3.0 - sqlite >=3.46.0,<3.47 - suitesparse <7.7.0 @@ -107,6 +107,7 @@ requirements: - swig - texlive-core - tnt + - usgscsm >=2.0.2 - x264 - xalan-c - xerces-c >=3.2.4,<3.3.0a0 @@ -115,7 +116,7 @@ requirements: - xorg-libsm - xorg-libx11 - xorg-libxi - - zlib >=1.3,<1.4 + - zlib >=1.3,<1.4.0a0 run: - {{ pin_compatible('ale', max_pin='x.x.x') }} @@ -160,7 +161,7 @@ requirements: - {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }} - {{ pin_compatible('protobuf', max_pin='x.x') }} - qhull - - {{ pin_compatible('qt-main', max_pin='x.x') }} + - {{ pin_compatible('qt-main', max_pin='x.x', min_pin="x.x") }} - {{ pin_compatible('qwt', max_pin='x.x') }} - rclone - {{ pin_compatible('suitesparse', min_pin='x.x', max_pin='x.x') }}