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

Fix #72 and #71, Upgrades to PyQt 5 and sequence count fix #85

Merged

Conversation

lbleier-GSFC
Copy link
Contributor

@lbleier-GSFC lbleier-GSFC commented May 7, 2020

Describe the contribution
This is a major change, upgrading PyQt4 to PyQt5 and includes a lot of cleanup/refactoring, and changes to the GUI itself

Fix #71
Fix #72

Testing performed
Steps taken to test the contribution:

  1. Make changes
  2. Run software to see that it works

Additional context
PLEASE NOTE: All .ui files as well as any .py files auto-generated by pyuic5 should be ignored during review, as these are related to the GUI itself

Contributor Info - All information REQUIRED for consideration of pull request
Leor Bleier, NASA GSFC\Code 582

@skliper skliper changed the title Fix72 upgradepyqt Fix#72 and #71, Upgrades to PyQt 5 and sequence count fix May 11, 2020
@skliper skliper added the CCB:Ignore Pull Request is NOT ready for discussion. Has open actions. Will be re-examined at by next CCB. label May 11, 2020
@skliper
Copy link
Contributor

skliper commented May 11, 2020

Marking as not ready until the #83 commits get sorted out (diverged from IC), #81 gets removed (not ready commit), and history gets squashed.

@lbleier-GSFC lbleier-GSFC force-pushed the fix72-upgradepyqt branch 2 times, most recently from 9e95db1 to 9555ec8 Compare May 11, 2020 21:24
@astrogeco astrogeco added CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) and removed CCB:Ignore Pull Request is NOT ready for discussion. Has open actions. Will be re-examined at by next CCB. labels May 13, 2020
@astrogeco astrogeco requested a review from dmknutsen May 13, 2020 02:47
@astrogeco astrogeco changed the title Fix#72 and #71, Upgrades to PyQt 5 and sequence count fix Fix #72 and #71, Upgrades to PyQt 5 and sequence count fix May 13, 2020
.gitignore Outdated Show resolved Hide resolved
Subsystems/tlmGUI/EventMessage.py Outdated Show resolved Hide resolved
@skliper
Copy link
Contributor

skliper commented May 13, 2020

CCB 20200513 - Approved with cleanup needed

@skliper skliper removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label May 13, 2020
This was linked to issues May 15, 2020
@astrogeco
Copy link
Contributor

@lbleier-GSFC can you take a look at resolving the comments and conflicts?

@lbleier-GSFC
Copy link
Contributor Author

@lbleier-GSFC can you take a look at resolving the comments and conflicts?

Should be ok now

@astrogeco
Copy link
Contributor

@lbleier-GSFC Thanks! Can you rebase and squash commits

@lbleier-GSFC
Copy link
Contributor Author

@lbleier-GSFC Thanks! Can you rebase and squash commits

Please verify this looks ok

@skliper
Copy link
Contributor

skliper commented May 20, 2020

@lbleier-GSFC still needs a rebase. Don't merge ic into your work, rebase your work on ic.

Also includes general fixes/refactoring/cleanup. Also fixes nasa#71
@skliper
Copy link
Contributor

skliper commented May 20, 2020

@astrogeco fixed!

@astrogeco astrogeco merged commit 8cb6a28 into nasa:integration-candidate May 20, 2020
@astrogeco astrogeco added IC-20200513 CCB:Approved Indicates approval by CCB labels May 20, 2020
@skliper skliper added this to the 2.2.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update PyQt4 to PyQt5 Sequence count likely not coming from header
5 participants