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(pasta_app_crash): revert the PySide6 fixed version requirement #359

Merged
merged 2 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pasta_eln/miscTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def _flatten(_d:Union[Mapping[Any, Any], list[Any]], depth:int, parent:object=No
""" Recursive function """
key_value_iterable = (enumerate(_d) if isinstance(_d, enumerate_types) else _d.items())
has_item = False
for key, value in key_value_iterable: # type: ignore[union-attr]
for key, value in key_value_iterable:
has_item = True
flat_key = dot_reducer(parent, key)
if isinstance(value, flatten_types):
Expand Down
2 changes: 1 addition & 1 deletion requirements-linux.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#This file is autogenerated by commit.py from setup.cfg. Change content there
pyside6==6.7.3
pyside6
qt-material
QtAwesome
cloudant
Expand Down
2 changes: 1 addition & 1 deletion requirements-windows.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#This file is autogenerated by commit.py from setup.cfg. Change content there
pyside6==6.7.3
pyside6
qt-material
QtAwesome
cloudant
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers =
python_requires = >= 3.10
# https://setuptools.pypa.io/en/latest/userguide/dependency_management.html
install_requires =
pyside6==6.7.3
pyside6
qt-material
QtAwesome
cloudant
Expand Down
3 changes: 1 addition & 2 deletions tests/unit_tests/test_dataverse_compound_data_type_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
#
# You should have received a copy of the license with this file. Please refer the license file for more information.

from unittest.mock import MagicMock
from unittest.mock import MagicMock, call

import pytest
from PySide6.QtWidgets import QBoxLayout, QDateTimeEdit, QFrame, QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout
from _pytest.mark import param
from mock.mock import call

from pasta_eln.GUI.dataverse.compound_data_type_class import CompoundDataTypeClass
from pasta_eln.GUI.dataverse.data_type_class_context import DataTypeClassContext
Expand Down
Loading