Skip to content

Fix decoding issue of git version for py3#222

Merged
mark-petersen merged 3 commits intoMPAS-Dev:developfrom
xylar:compass/fix_git_version_for_py3
May 9, 2019
Merged

Fix decoding issue of git version for py3#222
mark-petersen merged 3 commits intoMPAS-Dev:developfrom
xylar:compass/fix_git_version_for_py3

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Apr 29, 2019

The utility_scripts were not included in #177

Fixes a bug by decoding the git_version into a unicode string in manage_regression_test_suite.py, required for python 3 compatibility.

@xylar
Copy link
Collaborator Author

xylar commented Apr 29, 2019

Testing

I used this fix as part of testing my new COMPASS conda environment for python 3 (see MPAS-Dev/geometric_features#102 (comment)).

@xylar xylar force-pushed the compass/fix_git_version_for_py3 branch from 8f2a5da to 834b3b8 Compare April 29, 2019 12:03
@xylar xylar added the python 3 label Apr 29, 2019
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Lots of tabs have been replaced with spaces. It's a bad practice to have a mix of tabs and spaces in a python file, and generally tabs should be avoided.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks. I appreciate that.

@xylar
Copy link
Collaborator Author

xylar commented May 9, 2019

@mark-petersen, this was included in #229 and was therefore part of your testing and mine. However, it needs to get merged to develop and then we need to merge develop to ocean/develop before #229 can go in.

@xylar xylar force-pushed the compass/fix_git_version_for_py3 branch from b01cd24 to 5681879 Compare May 9, 2019 12:32
Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Tested with #229. It all works, see notes there.

@mark-petersen
Copy link
Contributor

mark-petersen commented May 9, 2019

@mgduda and @matthewhoffman: FYI this is COMPASS only, but a merge into develop. It does not affect atmosphere core. I will be merging this today.

@mark-petersen mark-petersen merged commit 5681879 into MPAS-Dev:develop May 9, 2019
mark-petersen added a commit that referenced this pull request May 9, 2019
The utility_scripts were not included in #177

Fixes a bug by decoding the git_version into a unicode string in
manage_regression_test_suite.py, required for python 3 compatibility.
@xylar xylar deleted the compass/fix_git_version_for_py3 branch May 9, 2019 14:42
@xylar
Copy link
Collaborator Author

xylar commented May 9, 2019

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants