Skip to content

Commit

Permalink
8.1.0_RC2 Updates (#5399)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
chkim-usgs authored Jan 10, 2024
1 parent d44f0f6 commit 9d7f213
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,10 @@ release.

## [Unreleased]

### Added
- Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397)

### Fixed
- Fixed <i>noproj</i> bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377)

## [8.1.0] - 2023-12-05
## [8.1.0] - 2024-01-08

### Changed
- 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),
Expand All @@ -54,6 +51,8 @@ release.
outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162)
- 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)
- Disabled option to use web=true when running spiceinit with HRSC images. [#5223](https://github.com/DOI-USGS/ISIS3/issues/5223)
- Set build option `pybindings=ON` in `build.sh` to turn on python bindings. [#5389](https://github.com/DOI-USGS/ISIS3/pull/5389)
- Updated Ale to version 0.10.0 [#5399](https://github.com/DOI-USGS/ISIS3/pull/5399)

### Added
- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
Expand All @@ -70,6 +69,7 @@ release.
- Added ability to delegate calculation of nadir pointing to ALE [#5117](https://github.com/USGS-Astrogeology/ISIS3/issues/5117)
- Added --no-kernels flag to downloadIsisData [#5264](https://github.com/DOI-USGS/ISIS3/issues/5264)
- 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)
- Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397)

### Deprecated

Expand Down
44 changes: 44 additions & 0 deletions code.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,49 @@
"date": {
"metadataLastUpdated": "2023-04-19"
}
},{
"name": "ISIS3",
"organization": "U.S. Geological Survey",
"description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",
"version": "8.1.0_RC2",
"status": "Production",

"permissions": {
"usageType": "openSource",
"licenses": [
{
"name": "Public Domain, CC0-1.0",
"URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/LICENSE.md"
}
]
},

"homepageURL": "https://isis.astrogeology.usgs.gov",
"downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.1.0_RC2/8.1.0_RC2.zip",
"disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/DISCLAIMER.md",
"repositoryURL": "https://code.usgs.gov/astrogeology/isis.git",
"vcs": "git",

"laborHours": 0,

"tags": [
"Planetary",
"Remote Sensing",
"Photogrammetry",
"Data Processing"
],

"languages": [
"C++"
],

"contact": {
"name": "Christine Kim",
"email": "chkim@usgs.gov"
},

"date": {
"metadataLastUpdated": "2024-01-08"
}
}
]
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults

dependencies:
- ale>=0.9.1, <1
- ale>=0.10.0, <1
- armadillo
- boost>=1.72.0, <2
- boost-cpp>=1.72.0, <2
Expand Down
2 changes: 1 addition & 1 deletion environment_gcc4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
- defaults

dependencies:
- ale>=0.8.5
- ale>=0.10.0
- boost=1.68.0
- armadillo
- blas
Expand Down
2 changes: 1 addition & 1 deletion isis/IsisPreferences
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ EndGroup
########################################################

Group = Plugins
CSMDirectory = ("$CONDA_PREFIX/lib/csmplugins/", -
CSMDirectory = ("$ISISROOT/lib/csmplugins/", -
"$ISISROOT/lib/isis/csm3.0.3/", -
"$ISISROOT/csmlibs/3.0.3/", -
"$HOME/.Isis/csm3.0.3/")
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ build:
# Shotgun strat on requirements until we can narrow them down
requirements:
build:
- ale=0.9.1
- ale=0.10.0
- aom
- armadillo
- boost=1.72
Expand Down

0 comments on commit 9d7f213

Please sign in to comment.