Skip to content

Commit 041d5b2

Browse files
authored
8.1.0_RC2 Release Prep (#5398)
* Update csm plugins path in IsisPreferences (#5397) * Update csm plugins path in IsisPreferences * Update changelog * Add trailing slash * 8.1.0_RC2 version ticks * Moved changelog entry * 8.1.0_RC2 Updates (#5399) * 8.2.0_RC2 updates * Changes for 8.1.0_RC2 (#5387) * Fix dependency formatting in meta.yaml * Pin gsl, update docs * Revert pin * Pin gsl to 2.6 * Add 8.1.0_RC1 as separate code entry * Update the urls for 8.0 entry * Turn on python bindings to be installed during build * Add back kakadu build * Add pybindings changelog entry * Revert "Changes for 8.1.0_RC2 (#5387)" This reverts commit 7994454. * Bump ALE to 0.10.0 * Update csm plugins path from CONDA_PREFIX to ISISROOT * Set build num to 0, add back rc1 code entry
1 parent 67424e9 commit 041d5b2

File tree

6 files changed

+54
-6
lines changed

6 files changed

+54
-6
lines changed

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ release.
3535

3636
## [Unreleased]
3737

38-
## [8.1.0] - 2023-12-08
38+
## [8.1.0] - 2024-01-08
3939

4040
### Changed
4141
- Cnetthinner has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354),
@@ -48,6 +48,8 @@ release.
4848
outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162)
4949
- Changed the default PCK load behavior to try and load mission specific PCKs, if that fails we default to the base PCKs [#5335](https://github.com/DOI-USGS/ISIS3/pull/5335)
5050
- Disabled option to use web=true when running spiceinit with HRSC images. [#5223](https://github.com/DOI-USGS/ISIS3/issues/5223)
51+
- Set build option `pybindings=ON` in `build.sh` to turn on python bindings. [#5389](https://github.com/DOI-USGS/ISIS3/pull/5389)
52+
- Updated Ale to version 0.10.0 [#5399](https://github.com/DOI-USGS/ISIS3/pull/5399)
5153

5254
### Added
5355
- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
@@ -64,6 +66,7 @@ release.
6466
- Added ability to delegate calculation of nadir pointing to ALE [#5117](https://github.com/USGS-Astrogeology/ISIS3/issues/5117)
6567
- Added --no-kernels flag to downloadIsisData [#5264](https://github.com/DOI-USGS/ISIS3/issues/5264)
6668
- Added notice for depreciation to PvlObject::addLogGroup function which will be depreciated in favor of Application::appendAndLog(https://github.com/DOI-USGS/ISIS3/issues/5310)
69+
- Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397)
6770

6871
### Deprecated
6972

code.json

+44
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,50 @@
8787
"date": {
8888
"metadataLastUpdated": "2023-04-19"
8989
}
90+
},{
91+
"name": "ISIS3",
92+
"organization": "U.S. Geological Survey",
93+
"description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",
94+
"version": "8.1.0_RC2",
95+
"status": "Production",
96+
97+
"permissions": {
98+
"usageType": "openSource",
99+
"licenses": [
100+
{
101+
"name": "Public Domain, CC0-1.0",
102+
"URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/LICENSE.md"
103+
}
104+
]
105+
},
106+
107+
"homepageURL": "https://isis.astrogeology.usgs.gov",
108+
"downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.1.0_RC2/8.1.0_RC2.zip",
109+
"disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/DISCLAIMER.md",
110+
"repositoryURL": "https://code.usgs.gov/astrogeology/isis.git",
111+
"vcs": "git",
112+
113+
"laborHours": 0,
114+
115+
"tags": [
116+
"Planetary",
117+
"Remote Sensing",
118+
"Photogrammetry",
119+
"Data Processing"
120+
],
121+
122+
"languages": [
123+
"C++"
124+
],
125+
126+
"contact": {
127+
"name": "Christine Kim",
128+
"email": "[email protected]"
129+
},
130+
131+
"date": {
132+
"metadataLastUpdated": "2024-01-08"
133+
}
90134
},{
91135
"name": "ISIS3",
92136
"organization": "U.S. Geological Survey",

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44

55
dependencies:
66
- kalasiris
7-
- ale=0.9.1
7+
- ale>=0.10.0, <1
88
- armadillo
99
- boost=1.72
1010
- boost-cpp=1.72

environment_gcc4.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ channels:
66
- defaults
77

88
dependencies:
9-
- ale>=0.8.5
9+
- ale>=0.10.0
1010
- boost=1.68.0
1111
- armadillo
1212
- blas

isis/IsisPreferences

+2-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ EndGroup
178178
########################################################
179179

180180
Group = Plugins
181-
CSMDirectory = ("$ISISROOT/lib/isis/csm3.0.3/", -
181+
CSMDirectory = ("$ISISROOT/lib/csmplugins/", -
182+
"$ISISROOT/lib/isis/csm3.0.3/", -
182183
"$ISISROOT/csmlibs/3.0.3/", -
183184
"$HOME/.Isis/csm3.0.3/")
184185
EndGroup

recipe/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# A Public Release for ISIS3.6.1: {% set version = "3.6.1" %}
1919
# A Release Candidate for ISIS3.6.1: {% set version = "3.6.1_RC" %}
2020
# A custom build of ISIS3.6.1 for the CaSSIS mission: {% set version = "3.6.1_cassis" %}
21-
{% set version = "8.1.0_RC1" %}
21+
{% set version = "8.1.0_RC2" %}
2222

2323
# This is the build number for the current version you are building. If this is the first build of
2424
# this version, the build number will be 0. It is incremented by 1 with every consecutive build of
@@ -46,7 +46,7 @@ build:
4646
requirements:
4747
build:
4848
- kalasiris
49-
- ale=0.9.1
49+
- ale=0.10.0
5050
- armadillo
5151
- boost=1.72
5252
- boost-cpp=1.72

0 commit comments

Comments
 (0)