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

Changes for 8.1.0_RC2 #5387

Merged
merged 9 commits into from
Dec 22, 2023
Merged

Changes for 8.1.0_RC2 #5387

merged 9 commits into from
Dec 22, 2023

Conversation

chkim-usgs
Copy link
Contributor

Description

Includes fixes and other changes for upcoming 8.1.0 Release Candidate 2:

  • Turns on python bindings to be installed during conda release build (here)

Related Issue

How Has This Been Validated?

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.

@@ -1,5 +1,5 @@
mkdir build
cd build
export ISISROOT=$PWD
cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should leave the Kakadu include dir. I imagine it was from local testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm I think there was a mix up during rebasing my 8.1 branch off of the official 8.1 branch but got this reverted, good catch.

Kelvinrr
Kelvinrr previously approved these changes Dec 22, 2023
Copy link
Collaborator

@Kelvinrr Kelvinrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can undraft this. But we should also include this into the main repo. I think the "cleaner" way would be merge into the main repo then cherry-pick into the 8.1 branch. But I'll leave it up to you how to do it since how small the change is, it's kind of whatever.

@chkim-usgs chkim-usgs marked this pull request as ready for review December 22, 2023 19:52
@chkim-usgs chkim-usgs changed the base branch from 8.1 to dev December 22, 2023 19:53
@chkim-usgs chkim-usgs dismissed Kelvinrr’s stale review December 22, 2023 19:53

The base branch was changed.

@chkim-usgs chkim-usgs changed the base branch from dev to 8.1 December 22, 2023 19:54
@chkim-usgs chkim-usgs merged commit 67424e9 into DOI-USGS:8.1 Dec 22, 2023
chkim-usgs added a commit to chkim-usgs/ISIS3 that referenced this pull request Jan 8, 2024
* 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
chkim-usgs added a commit to chkim-usgs/ISIS3 that referenced this pull request Jan 8, 2024
chkim-usgs added a commit that referenced this pull request Jan 10, 2024
* 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
chkim-usgs added a commit that referenced this pull request Jan 10, 2024
* 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
chkim-usgs added a commit that referenced this pull request Jan 10, 2024
* 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
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