Skip to content

Merge py-pandas, py-awscrt, texinfo, and ectrans bug fixes from release/1.5.1 (with mods from spack develop)#346

Merged
climbfuji merged 17 commits intoJCSDA:jcsda_emc_spack_stackfrom
climbfuji:feature/merge_openpyxl_etc_from_release_151
Oct 18, 2023
Merged

Merge py-pandas, py-awscrt, texinfo, and ectrans bug fixes from release/1.5.1 (with mods from spack develop)#346
climbfuji merged 17 commits intoJCSDA:jcsda_emc_spack_stackfrom
climbfuji:feature/merge_openpyxl_etc_from_release_151

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Oct 16, 2023

Description

This PR cherry-picks bug fixes from the release/1.5.1 branch (PRs #342 and #339). On top of these are rather extensive changes for the py-pandas/py-openpyxl bug fix that come from spack develop.

(Background: I created PRs for spack develop based on the commits for release/1.5.1, these received feedback and got updated - improved! - rather significantly: spack#40469, spack#40470, spack#40472). I pulled in the original commits for release/1.5.1 first, then added the spack develop PRs on top (cherry-picking made sure there were no merge conflicts), and that's what you are seeing here.

Issue(s) addressed

All issues were resolved when merging the updates into release/1.5.1, this is just bringing the improved and spack-sanctioned versions into jcsda_emc_spack_stack.

The changes in this PR are tested with JCSDA/spack-stack#831

Dependencies

n/a

Impact

n/a

Checklist

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have run the unit tests before creating the PR

Copy link
Copy Markdown
Collaborator

@srherbener srherbener left a comment

Choose a reason for hiding this comment

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

Thanks for bringing these in to the jcsda_emc_spack_stack (development) branch!

@climbfuji climbfuji merged commit 22ab925 into JCSDA:jcsda_emc_spack_stack Oct 18, 2023
@climbfuji climbfuji deleted the feature/merge_openpyxl_etc_from_release_151 branch October 18, 2023 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

INFRA JEDI Infrastructure

Projects

No open projects

Development

Successfully merging this pull request may close these issues.

3 participants