Q4 support sprint bug fixes PR (#5273)

* Check if history blob buffer is null before executing memcpy (#5205) * Check if history blob buffer is null before executing memcpy * Updated CHANGELOG * changed description for tgocassisrdrgen to be more descriptive than before (#5167) * changed description for tgocassisrdrgen to be more descriptive than before. * modifying the changelog to reflect doc changes * fix typo * Documentation fix for broken links in User Docs (#5182) * doc changes for new links, need to scan other files for the same * fixed remaining links * typo * fixed command line references link for ISIS3 Applications * Removed version specification from conda install command (#5236) * Clean Build Warnings (#5257) * std::unary/binary_function to std:::function * sprintf -> snprintf * vsprintf -> vsnprintf * fixed misc warnings * bypass jenkins error * Cmake mac 13 (#5261) * added quotes to Utilities.cmake * Added config for mac 13.4 * updated config to target macos13.5 * Segfault fix and tests (#5262) * fixed map definition reference link (#5265) * Update geos to 3.11.1 (#5266) * Update geos to 3.11.1 * Fixed failing test * fixes rclone recopying existing kernels (#5255) * fixes rclone duplication * updated changelog * Updated script * Addressed PR feedback * cubeit attribute fix (#5268) * cubeit attribute fix * Update changelog * Convert cholmod 32 bit to 64 bit calls (#5267) * Updated cholmod calls to 64 bit * changed int triple indices to long * Fixed errorpropagation cholmod call * Updated changelog * Campt attribute fix (#5269) * Prevent cube manager from setting the virtual band * Pass potential cube attributes through to the cube manager in campt * Added changelog entry * Fixed change log entry * Updated environment test --------- Co-authored-by: Christine Kim <[email protected]> Co-authored-by: Anton Hibl <[email protected]> Co-authored-by: Austin Sanders <[email protected]> Co-authored-by: Amy Stamile <[email protected]> Co-authored-by: Jacob Cain <[email protected]>
DOI-USGS · Aug 23, 2023 · 0dc7e39 · 0dc7e39
1 parent 785a868
commit 0dc7e39
Show file tree

Hide file tree

Showing 63 changed files with 1,268 additions and 503 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ release.
 ## [Unreleased]
 
 ### Changed
+- Changed cholmod 32 bit calls to 64 bit calls [#5173](https://github.com/DOI-USGS/ISIS3/issues/5173) and [#5176](https://github.com/DOI-USGS/ISIS3/issues/5176)
 
 ### Added
 
@@ -44,13 +45,19 @@ release.
 ### Removed
 
 ### Fixed
+- Updated History constructor to check for invalid BLOB before copying History BLOB to output cube [#4966](https://github.com/DOI-USGS/ISIS3/issues/4966)
+- Fixed downloadIsisData script copying existing files with every rclone download [#5245](https://github.com/DOI-USGS/ISIS3/issues/5245)
+- Fixed gaussstretch segmentation fault error and refactored gaussstretch files/tests to use gtest [#5240](https://github.com/DOI-USGS/ISIS3/issues/5240)
+- Fixed `cubeit` attribute error to allow attribute specification on the output cube filename [#5234](https://github.com/DOI-USGS/ISIS3/issues/5234)
+- Fixed `campt` to handle input band selection attribute correctly [#5234](https://github.com/DOI-USGS/ISIS3/issues/5235)
 
 ## [8.0.0] - 2023-04-19
 
 ### Changed
 - Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001)
 - Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083) 
 - Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command
+- Updated documentation for `tgocassisrdrgen` to be more descriptive and accurate.
 - Updated Geos from version 3.7 to 3.9 [#3627](https://github.com/DOI-USGS/ISIS3/issues/3627)
 - Updated Ale to version 0.9.1 [#5209](https://github.com/DOI-USGS/ISIS3/pull/5209)
 - Changed buildCondaRelease.py numpy version from 1.23 to 1.22 to resolve spiceinit warning messages [#5224](https://github.com/DOI-USGS/ISIS3/issues/5224)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 conda activate isis > /dev/null
                 conda config --env --set channel_priority flexible
                 conda install -c conda-forge python=3 findutils
-                mamba env update -f environment.yml --prune
+                conda env update -f environment.yml --prune
                 conda activate isis
                 mamba install -c conda-forge git
                 git submodule update --init --recursive

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+
 1. The environment is now ready to download ISIS and its dependencies:
 
     ```bash
-    conda install -c usgs-astrogeology isis=7.0.0
+    conda install -c usgs-astrogeology isis
     ```
 
 1. Finally, setup the environment variables:

diff --git a/environment.yml b/environment.yml
@@ -20,7 +20,7 @@ dependencies:
   - eigen < 3.4
   - embree>=2.17,<3
   - ffmpeg
-  - geos>=3.9,<3.10
+  - geos =3.11.1
   - geotiff
   - gmp
   - graphviz

diff --git a/isis/cmake/Utilities.cmake b/isis/cmake/Utilities.cmake
@@ -171,7 +171,7 @@ function(get_os_version text)
     # Format the string
     string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" version "${result}")
     string(REGEX MATCH "^[0-9]+.[0-9]+" version "${version}")
-    string(REPLACE "." "_" version ${version})
+    string(REPLACE "." "_" version "${version}")
 
     set(name   "MacOSX")
     set(prefix "Darwin_x86_64_")