Fix issues#162
Merged
seweber merged 3 commits intopairinteraction:masterpairinteraction/pairinteraction:masterfrom Jun 26, 2023
johannes-moegerle:fix_issuesjohannes-moegerle/pairinteraction:fix_issuesCopy head branch name to clipboard
Merged
Fix issues#162seweber merged 3 commits intopairinteraction:masterpairinteraction/pairinteraction:masterfrom johannes-moegerle:fix_issuesjohannes-moegerle/pairinteraction:fix_issuesCopy head branch name to clipboard
seweber merged 3 commits intopairinteraction:masterpairinteraction/pairinteraction:masterfrom
johannes-moegerle:fix_issuesjohannes-moegerle/pairinteraction:fix_issuesCopy head branch name to clipboard
Conversation
kill all processes before clearing cache
Member
|
Maybe this could also be added to the patchset. This is to (possibly?) work around the test failure that I observed on Flathub: https://buildbot.flathub.org/#/builders/35/builds/5977/steps/8/logs/stdio diff --git a/pairinteraction_gui/worker.py b/pairinteraction_gui/worker.py
index febc284e..b99ba013 100644
--- a/pairinteraction_gui/worker.py
+++ b/pairinteraction_gui/worker.py
@@ -16,6 +16,7 @@
# along with the pairinteraction GUI. If not, see <http://www.gnu.org/licenses/>.
from queue import Queue
+from PyQt5 import sip
from PyQt5.QtCore import QThread, pyqtSignal
@@ -29,7 +30,8 @@ class Worker(QThread):
def __del__(self):
self.exiting = True
- self.wait()
+ if not sip.isdeleted(self):
+ self.wait()
def execute(self, stdout):
self.stdout = stdout |
Contributor
Author
|
We are also calling QThread.wait in pipy_thready.py (see PipyThread.terminate), as well as a few times directly in app.py. |
Member
|
I think the culprit here is that |
Contributor
Author
|
The flathub fix fails in Linux / ubuntu. My guess is, this is due to PyQt5 being on version 5.14 instead of 5.15 as all the other builds. |
hmenke
reviewed
Jun 26, 2023
pairinteraction_gui/worker.py
Outdated
| # along with the pairinteraction GUI. If not, see <http://www.gnu.org/licenses/>. | ||
| from queue import Queue | ||
|
|
||
| from PyQt5 import sip |
Member
There was a problem hiding this comment.
Suggested change
| from PyQt5 import sip | |
| # https://www.riverbankcomputing.com/static/Docs/PyQt5/incompatibilities.html#importing-the-sip-module | |
| try: | |
| from PyQt5 import sip | |
| except ImportError: | |
| import sip |
seweber
approved these changes
Jun 26, 2023
523cd4e to
3a39c50
Compare
hmenke
approved these changes
Jun 26, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
see #159 and #161