PR: Fix bug when importing from PySide6.QtWebEngineCore/QtWebEngineWidgets (QWebEngineScrip vs QWebEngineScript) #455
PR: Fix bug when importing from PySide6.QtWebEngineCore/QtWebEngineWidgets (QWebEngineScrip vs QWebEngineScript) #455dalthviz merged 3 commits intospyder-ide:masterfrom damonlynch:PySide6-QWebEngineScript-fix
PySide6.QtWebEngineCore/QtWebEngineWidgets (QWebEngineScrip vs QWebEngineScript) #455Conversation
dalthviz
left a comment
There was a problem hiding this comment.
Thank you @damonlynch for spotting this error and submitting a fix! Could it be possible for you to also remove or modify the test skip we have at
qtpy/qtpy/tests/test_qtwebenginewidgets.py
Lines 6 to 9 in 1cc3901
?
Other than that this LGTM 👍 Let us know If you need any help regarding the test modification or if it is okay for us to do that change here!
PySide6.QtWebEngineCore (QWebEngineScrip vs QWebEngineScript)
|
Thanks @dalthviz, I have made the changes to the test code, which were pretty simple. However, my knowledge of git is quite minimal. Should I make a new, separate commit with the changes, or use some other kind of git command to incorporate the changes? Then how do I incorporate the changes into this pull request? By the way, I was unable to understand how to set up pytest using the instructions in |
No problem! So, you will need to do the test change and commit that change over the fork branch that you named cd <path where your fork clone is located>
git checkout PySide6-QWebEngineScript-fixThen, update the relevant test file, add the changes, create a commit and push it. After doing the change to the test file, you will need to run something like: git add .
git commit -m "Update QtWebEngineCore test"
git pushIf that sounds a little bit to complicated, I think you can use the GitHub web interface to create the commit for the test too. For that, you just need to navigate to the file while having the related fork branch to this PR selected. In this case, I think you should be able to edit using the GitHub web interface using this link: https://github.com/damonlynch/qtpy/edit/PySide6-QWebEngineScript-fix/qtpy/tests/test_qtwebenginewidgets.py
And to run The If you have further questions, regarding how to add the changes to this PR, comments or want for us to help you finish this let us know! |
|
I didn't realise it was as easy as simply adding another commit. I have now done that, and pushed it to GitHub. I also got confused by the section that explains how to install qtpy in editable mode, so I skipped that part. That means I have not personally run the changes I made to the test code in the most recent commit. However, given these changes are so simple, it probably doesn't matter in this instance. |
dalthviz
left a comment
There was a problem hiding this comment.
Thank you for the new commit @damonlynch ! I left some suggestions regarding the skip. Just in case, you can apply the suggestions in batch by going to the Files changed tab.
Let us know if you have further comments or questions!
damonlynch
left a comment
There was a problem hiding this comment.
Code changes made as suggested, with a formatting change made by black
PySide6.QtWebEngineCore (QWebEngineScrip vs QWebEngineScript) PySide6.QtWebEngineCore/QtWebEngineWidgets (QWebEngineScrip vs QWebEngineScript)
Fix typo in import statement