Pyqt5 to pyqt6 migration #37
Merged
Conversation
This file contains 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
RaghavaAlajangi
commented
Dec 3, 2024
tests/test_fd_fit_model_expr.py
Outdated
| assert np.allclose(parmsf["E1"].value, 15388.787369767488, | ||
| atol=10) # this fit is not very stable | ||
| # assert np.allclose(parmsf["E1"].value, 15388.787369767488, | ||
| # atol=10) # this fit is not very stable |
There was a problem hiding this comment.
I commented this assertion because it keeps failing. I don't know how to fix it.
There was a problem hiding this comment.
That is fine. You can uncomment it again. I will deal with it later.
|
Hi @paulmueller |
Welcome to Codecov 🎉Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests. Thanks for integrating Codecov - We've got you covered ☂️ |
|
I am having problems running the tests with Python 3.12: pytest --sw tests/
===================================================================================================== test session starts =====================================================================================================
platform linux -- Python 3.12.3, pytest-8.3.4, pluggy-1.5.0
PyQt6 6.7.1 -- Qt runtime 6.7.3 -- Qt compiled 6.7.1
rootdir: /tmp/PyJibe
configfile: pyproject.toml
plugins: qt-4.4.0
collected 29 items
stepwise: no previously failed tests, not skipping.
tests/test_fd_base.py .F
========================================================================================================== FAILURES ===========================================================================================================
_________________________________________________________________________________________________ test_clear_and_verify_data __________________________________________________________________________________________________
qtbot = <pytestqt.qtbot.QtBot object at 0x7ee885d296a0>
def test_clear_and_verify_data(qtbot):
main_window = pyjibe.head.PyJibe()
> main_window.load_data(files=make_directory_with_data())
tests/test_fd_base.py:23:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
pyjibe/head/main.py:148: in load_data
self.add_subwindow(aclass, flist)
pyjibe/head/main.py:153: in add_subwindow
inst = aclass(sub)
pyjibe/fd/main.py:37: in __init__
uic.loadUi(path_ui, self)
.env/lib/python3.12/site-packages/PyQt6/uic/load_ui.py:86: in loadUi
return DynamicUILoader(package).loadUi(uifile, baseinstance)
.env/lib/python3.12/site-packages/PyQt6/uic/Loader/loader.py:62: in loadUi
return self.parse(filename)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:1014: in parse
self._handle_widget(ui_file.widget)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:842: in _handle_widget
self.traverseWidgetTree(el)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:512: in createLayout
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:555: in handleItem
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:280: in createWidget
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:512: in createLayout
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:555: in handleItem
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:280: in createWidget
self.traverseWidgetTree(elem)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:818: in traverseWidgetTree
handler(self, child)
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:271: in createWidget
self.stack.push(self._setupObject(widget_class, parent, elem))
.env/lib/python3.12/site-packages/PyQt6/uic/uiparser.py:233: in _setupObject
obj = self.factory.createQtObject(class_name, object_name,
.env/lib/python3.12/site-packages/PyQt6/uic/objcreator.py:119: in createQtObject
return self._cpolicy.instantiate(ctor, object_name, ctor_args,
.env/lib/python3.12/site-packages/PyQt6/uic/Loader/qobjectcreator.py:145: in instantiate
return ctor(*ctor_args, **ctor_kwargs)
pyjibe/fd/widget_plot_fd.py:15: in __init__
self.mpl_curve.add_toolbar(self)
pyjibe/fd/mpl_indent.py:59: in add_toolbar
self.toolbar = custom_widgets.NavigationToolbarIndent(
pyjibe/head/custom_widgets/mpl_navigation_toolbar_icons.py:61: in __init__
super(NavigationToolbarIndent, self).__init__(*args, **kwargs)
pyjibe/head/custom_widgets/mpl_navigation_toolbar_icons.py:17: in __init__
super(NavigationToolbarCustom, self).__init__(*args, **kwargs)
.env/lib/python3.12/site-packages/matplotlib/backends/backend_qt.py:654: in __init__
a = self.addAction(self._icon(image_file + '.png'),
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
self = <pyjibe.head.custom_widgets.mpl_navigation_toolbar_icons.NavigationToolbarIndent object at 0x7ee87581dc70>, name = 'home_large.png', color = None
def _icon(self, name, color=None):
"""Override matplotlibs `_icon` function to get custom icons"""
name = name.replace('.png', '_large.png')
impath = str(cbook._get_data_path('images', name))
if not os.path.exists(impath):
imdir = pkg_resources.resource_filename("pyjibe", "img")
impath = os.path.join(imdir, name)
pm = QtGui.QPixmap(impath)
pm.setDevicePixelRatio(self.devicePixelRatioF() or 1)
if self.palette().color(self.backgroundRole()).value() < 128:
icon_color = self.palette().color(self.foregroundRole())
mask = pm.createMaskFromColor(QtGui.QColor('black'),
> QtCore.Qt.MaskOutColor)
E AttributeError: type object 'Qt' has no attribute 'MaskOutColor'
pyjibe/head/custom_widgets/mpl_navigation_toolbar_icons.py:31: AttributeError
====================================================================================================== warnings summary =======================================================================================================
.env/lib/python3.12/site-packages/afmformats/formats/fmt_jpk/jpk_meta.py:3
/tmp/PyJibe/.env/lib/python3.12/site-packages/afmformats/formats/fmt_jpk/jpk_meta.py:3: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
from pkg_resources import resource_filename
.env/lib/python3.12/site-packages/pkg_resources/__init__.py:3149
/tmp/PyJibe/.env/lib/python3.12/site-packages/pkg_resources/__init__.py:3149: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=================================================================================================== short test summary info ===================================================================================================
FAILED tests/test_fd_base.py::test_clear_and_verify_data - AttributeError: type object 'Qt' has no attribute 'MaskOutColor'
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Interrupted: Test failed, continuing from this test next run. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
=========================================================================================== 1 failed, 1 passed, 2 warnings in 1.84s ===========================================================================================I have the feeling that this is related to |
|
I can also work on this issue and create a new PR if you want. |
|
Hi Paul, |
paulmueller
approved these changes
Dec 16, 2024
| @@ -1,3 +1,5 @@ | |||
| 0.16.0 | |||
There was a problem hiding this comment.
There is no need to increment the minor version. Put it under 0.15.10 which is not released yet.
There was a problem hiding this comment.
on second thought, pyqt6 is a major change, so it's good this way 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR aims to implement migration from pyqt5 to pyqt6. This is described in the issue #35.