Sync with USGS/Astro dev branch #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Updates for 4.4RC (#4238) Co-authored-by: Amy Stamile <[email protected]> * Adds environment.yml changes to 4.4 (#4248) * ISIS Recipe Changes (#4224) * Updated recipe meta.yaml * Updated build.sh to include jenkins kakadu area * Updated ale version in recipe * Updated ale version in environment.ymls * Removed xalan-c and doxygen from meta.yml * Adds bash script to remove the kakadu path from build.sh and runs the anaconda build command Co-authored-by: acpaquette <[email protected]> * Updates for 4.4 Release * Revert "Updates for 4.4 Release" This reverts commit 6bf26a2. * Updates for 4.4 Release * Revert "Updates for 4.4 Release" This reverts commit 7211b5f. * Versioning updates for 4.4 release * Versioning updates for 4.4 release (#4258) * Reverted changes to recipe/meta.yaml and recipe/build.sh * Added host section to meta.yaml to try to fix libarmadillo error. * update versioning in meta.yaml * Added back DKAKADU to cmake * Fixed bash script * Removed duplicate Changelog header Co-authored-by: Amy Stamile <[email protected]> Co-authored-by: Kaitlyn Lee <[email protected]> Co-authored-by: acpaquette <[email protected]> Co-authored-by: Jesse Mapel <[email protected]>
…4293) * Moved location of unitTest data file to ISISTESTDATA * Moved unit test data to ISISTESTDATA/../testDataLocal * fixed bad path * fixed path to test files * updated to use non mission dir data files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync the my fork