Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Underscore Env Var Expansion #5402

Merged
merged 4 commits into from
Jan 19, 2024
Merged

Conversation

acpaquette
Copy link
Collaborator

@acpaquette acpaquette commented Jan 10, 2024

Description

ISIS was failing to expand $CONDA_PREFIX, when I dug into it I found that the "_" was considered an ending token for environment variables. This PR fixes this.

Related Issue

N/A

How Has This Been Validated?

Added test to cover change

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added my user impacting change to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@Kelvinrr
Copy link
Collaborator

I think this is good but I'll wait for Jenkins to come back

@acpaquette
Copy link
Collaborator Author

@Kelvinrr Looks good, all test failures are also failing on dev

@Kelvinrr Kelvinrr merged commit 62ed4f6 into DOI-USGS:dev Jan 19, 2024
acpaquette added a commit to acpaquette/ISIS3 that referenced this pull request Apr 19, 2024
* Fixed env var expansion to include underscores

* Added test to cover change

* Added changelog entry

* Renamed tests
acpaquette added a commit that referenced this pull request Apr 19, 2024
* Disable HRSC from spice server (#5270)

* Disable HRSC from spice server

* added docs

* Added test

* added changelog

* Update spiceinit URL (#5431)

* Update spiceinit URL

* added changelog

* Removed capital E that caused an error (#5466)

* Removed capital E that caused an error

* Updated changelog

* Updated references to isis_version.txt (#5464)

* Updated references to isis_version.txt

* Updated changelog

* Removed IrregularBodyCameraGroundMap.truth file. (#5462)

* Removed IrregularBodyCameraGroundMap.truth file. Had neglected to do so in original Tagcams instrument import PR. Addresses #5461.

* Changelog entry for removal of IrregularBodyCameraGroundMap truth file. Addresses #5461.

* Update HistogramTool to better support high dynamic range images (#5445)

* Updated histogram to create bin size based on dynamic range of window instead of full image

* Updated changelog

* Changed 'version' filename to honor reserved keyword. (#5434)

* Changed 'version' filename to honor cmake reserved keyword.

Changed 'version' filename to isis_version.txt. 'version' is a reserved
keyword in cmake.  Additionally, the extension should prevent this file
from being compiled as source, and eliminate the recompilation error.

* Updated changelog

* Reverted accidental change to version

* Updated version file name

* Fixed noproj bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. (#5378)

* Fixed noproj 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. Addresses #5377.

* Per review, moved changelog entry to the Unreleased section. Addresses #5377.

* Fixed bug in noproj where some temporary files were not deleted after completion (#5403)

* Fixed noproj bug where some temporary files were not cleaned up (deleted) after call to cam2cam. Also reworked how these temporary files are identified. Addresses #4813.

* Added copyright statement at top of source and header files. Addresses #4813.

* Fixed Underscore Env Var Expansion (#5402)

* Fixed env var expansion to include underscores

* Added test to cover change

* Added changelog entry

* Renamed tests

* Fixes match cube default to NULL (#5429)

* Updated rclone.conf to point to naif archived kernels (#5442)

* naif source includes /pub/naif, _naifkernels point to archived locations if available

* https for naif

* naif kernel fix description in changelog

* Fits Import fix (#5469)

* Fixed FitsToJson subprocess error

* Added changelog entry

* Update Hayabusa2 translation (#5433)

* Add spacecraft name trn

* Update changelog

* Added hyb2onc2isis test

---------

Co-authored-by: Kelvin Rodriguez <krodriguez@usgs.gov>

* Added Code.json entry

* Update CHANGELOG.md

* Update version in meta.yaml

* Update version in CMakeLists.txt

---------

Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com>
Co-authored-by: Austin Sanders <arsanders@usgs.gov>
Co-authored-by: kledmundson <6842706+kledmundson@users.noreply.github.com>
Co-authored-by: Jacob Cain <115182890+jrcain-usgs@users.noreply.github.com>
Co-authored-by: Christine Kim <125395064+chkim-usgs@users.noreply.github.com>
Co-authored-by: Kelvin Rodriguez <krodriguez@usgs.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants