Skip to content

Commit dba609f

Browse files
eskandariheskandarih
committed
implementing qtpy
1 parent 6533f12 commit dba609f

File tree

297 files changed

+875
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+875
-872
lines changed

‎Tests/GUI/Dialog/DMachineSetup/DAVDuct/test_DAVDuct.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44
import matplotlib.pyplot as plt
55
import pytest
6-
from PySide2 import QtWidgets
6+
from qtpy import QtWidgets
77

88
from pyleecan.Classes.Lamination import Lamination
99
from pyleecan.Classes.VentilationCirc import VentilationCirc

‎Tests/GUI/Dialog/DMachineSetup/DAVDuct/test_DAVDuct_circ.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import sys
44

55
import pytest
6-
from PySide2 import QtWidgets
7-
from PySide2.QtWidgets import QTabBar
6+
from qtpy import QtWidgets
7+
from qtpy.QtWidgets import QTabBar
88

99
from pyleecan.Classes.Lamination import Lamination
1010
from pyleecan.Classes.VentilationCirc import VentilationCirc

‎Tests/GUI/Dialog/DMachineSetup/DAVDuct/test_DAVDuct_polar.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import sys
44

55
import pytest
6-
from PySide2 import QtWidgets
7-
from PySide2.QtWidgets import QTabBar
6+
from qtpy import QtWidgets
7+
from qtpy.QtWidgets import QTabBar
88

99
from pyleecan.Classes.Lamination import Lamination
1010
from pyleecan.Classes.VentilationPolar import VentilationPolar

‎Tests/GUI/Dialog/DMachineSetup/DAVDuct/test_DAVDuct_trap.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import sys
44

55
import pytest
6-
from PySide2 import QtWidgets
7-
from PySide2.QtWidgets import QTabBar
6+
from qtpy import QtWidgets
7+
from qtpy.QtWidgets import QTabBar
88

99
from pyleecan.Classes.Lamination import Lamination
1010
from pyleecan.Classes.VentilationTrap import VentilationTrap

‎Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Benchmark.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import matplotlib.pyplot as plt
66
from numpy import max as np_max
77

8-
from PySide2 import QtWidgets
8+
from qtpy import QtWidgets
99
import pytest
1010
import mock
1111
from pyleecan.Classes.MachineSIPMSM import MachineSIPMSM
@@ -153,7 +153,7 @@ def test_Benchmark(self):
153153
## Initial state
154154
assert self.widget.w_step.test_err_msg is None
155155
with mock.patch(
156-
"PySide2.QtWidgets.QMessageBox.critical",
156+
"qtpy.QtWidgets.QMessageBox.critical",
157157
return_value=QtWidgets.QMessageBox.Ok,
158158
):
159159
self.widget.w_step.b_plot.clicked.emit()
@@ -309,7 +309,7 @@ def test_Benchmark(self):
309309
)
310310
assert not isfile(file_path)
311311
with mock.patch(
312-
"PySide2.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
312+
"qtpy.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
313313
):
314314
# To trigger the slot
315315
self.widget.w_step.b_export.clicked.emit()
@@ -454,7 +454,7 @@ def test_Benchmark(self):
454454

455455
assert self.widget.w_step.test_err_msg is None
456456
with mock.patch(
457-
"PySide2.QtWidgets.QMessageBox.critical",
457+
"qtpy.QtWidgets.QMessageBox.critical",
458458
return_value=QtWidgets.QMessageBox.Ok,
459459
):
460460
self.widget.w_step.b_plot.clicked.emit()
@@ -651,7 +651,7 @@ def test_Benchmark(self):
651651
res_path = join(save_path, "Simu_Results")
652652
makedirs(res_path)
653653
with mock.patch(
654-
"PySide2.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
654+
"qtpy.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
655655
):
656656
# To trigger the slot
657657
self.widget.w_step.w_path_result.b_path.clicked.emit()
@@ -662,7 +662,7 @@ def test_Benchmark(self):
662662

663663
## Run
664664
assert len(listdir(res_path)) == 0
665-
with mock.patch("PySide2.QtWidgets.QMessageBox.information", return_value=None):
665+
with mock.patch("qtpy.QtWidgets.QMessageBox.information", return_value=None):
666666
self.widget.w_step.b_next.clicked.emit()
667667
# Run creates a new results folder with execution time in the name
668668
assert len(listdir(res_path)) == 1

‎Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Benchmark_NS.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import matplotlib.pyplot as plt
66
from numpy import max as np_max
77

8-
from PySide2 import QtWidgets
8+
from qtpy import QtWidgets
99
import pytest
1010
import mock
1111
from pyleecan.Classes.MachineSIPMSM import MachineSIPMSM
@@ -154,7 +154,7 @@ def test_Benchmark(self):
154154
## Initial state
155155
assert self.widget.w_step.test_err_msg is None
156156
with mock.patch(
157-
"PySide2.QtWidgets.QMessageBox.critical",
157+
"qtpy.QtWidgets.QMessageBox.critical",
158158
return_value=QtWidgets.QMessageBox.Ok,
159159
):
160160
self.widget.w_step.b_plot.clicked.emit()
@@ -310,7 +310,7 @@ def test_Benchmark(self):
310310
)
311311
assert not isfile(file_path)
312312
with mock.patch(
313-
"PySide2.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
313+
"qtpy.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
314314
):
315315
# To trigger the slot
316316
self.widget.w_step.b_export.clicked.emit()
@@ -455,7 +455,7 @@ def test_Benchmark(self):
455455

456456
assert self.widget.w_step.test_err_msg is None
457457
with mock.patch(
458-
"PySide2.QtWidgets.QMessageBox.critical",
458+
"qtpy.QtWidgets.QMessageBox.critical",
459459
return_value=QtWidgets.QMessageBox.Ok,
460460
):
461461
self.widget.w_step.b_plot.clicked.emit()
@@ -726,7 +726,7 @@ def test_Benchmark(self):
726726
res_path = join(save_path, "Simu_Results")
727727
makedirs(res_path)
728728
with mock.patch(
729-
"PySide2.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
729+
"qtpy.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
730730
):
731731
# To trigger the slot
732732
self.widget.w_step.w_path_result.b_path.clicked.emit()
@@ -737,7 +737,7 @@ def test_Benchmark(self):
737737

738738
## Run
739739
assert len(listdir(res_path)) == 0
740-
with mock.patch("PySide2.QtWidgets.QMessageBox.information", return_value=None):
740+
with mock.patch("qtpy.QtWidgets.QMessageBox.information", return_value=None):
741741
self.widget.w_step.b_next.clicked.emit()
742742
# Run creates a new results folder with execution time in the name
743743
assert len(listdir(res_path)) == 1

‎Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Prius.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from os import makedirs, listdir
77
from numpy import max as np_max
88

9-
from PySide2 import QtWidgets
9+
from qtpy import QtWidgets
1010
import mock
1111
import pytest
1212
from pyleecan.Classes.MachineIPMSM import MachineIPMSM
@@ -160,7 +160,7 @@ def test_Toyota_Prius(self):
160160
## Initial state
161161
assert self.widget.w_step.test_err_msg is None
162162
with mock.patch(
163-
"PySide2.QtWidgets.QMessageBox.critical",
163+
"qtpy.QtWidgets.QMessageBox.critical",
164164
return_value=QtWidgets.QMessageBox.Ok,
165165
):
166166
self.widget.w_step.b_plot.clicked.emit()
@@ -321,7 +321,7 @@ def test_Toyota_Prius(self):
321321
)
322322
assert not isfile(file_path)
323323
with mock.patch(
324-
"PySide2.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
324+
"qtpy.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
325325
):
326326
# To trigger the slot
327327
self.widget.w_step.b_export.clicked.emit()
@@ -455,7 +455,7 @@ def test_Toyota_Prius(self):
455455

456456
assert self.widget.w_step.test_err_msg is None
457457
with mock.patch(
458-
"PySide2.QtWidgets.QMessageBox.critical",
458+
"qtpy.QtWidgets.QMessageBox.critical",
459459
return_value=QtWidgets.QMessageBox.Ok,
460460
):
461461
self.widget.w_step.b_plot.clicked.emit()
@@ -642,7 +642,7 @@ def test_Toyota_Prius(self):
642642
res_path = join(save_path, "Simu_Results")
643643
makedirs(res_path)
644644
with mock.patch(
645-
"PySide2.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
645+
"qtpy.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
646646
):
647647
# To trigger the slot
648648
self.widget.w_step.w_path_result.b_path.clicked.emit()
@@ -653,7 +653,7 @@ def test_Toyota_Prius(self):
653653

654654
## Run
655655
assert len(listdir(res_path)) == 0
656-
with mock.patch("PySide2.QtWidgets.QMessageBox.information", return_value=None):
656+
with mock.patch("qtpy.QtWidgets.QMessageBox.information", return_value=None):
657657
self.widget.w_step.b_next.clicked.emit()
658658
# Run creates a new results folder with execution time in the name
659659
assert len(listdir(res_path)) == 1

‎Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Railway.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from multiprocessing import cpu_count
77
import matplotlib.pyplot as plt
88

9-
from PySide2 import QtWidgets
9+
from qtpy import QtWidgets
1010
import mock
1111
import pytest
1212
from pyleecan.Classes.MachineSCIM import MachineSCIM
@@ -153,7 +153,7 @@ def test_Railway(self):
153153
## Initial state
154154
assert self.widget.w_step.test_err_msg is None
155155
with mock.patch(
156-
"PySide2.QtWidgets.QMessageBox.critical",
156+
"qtpy.QtWidgets.QMessageBox.critical",
157157
return_value=QtWidgets.QMessageBox.Ok,
158158
):
159159
self.widget.w_step.b_plot.clicked.emit()
@@ -327,7 +327,7 @@ def test_Railway(self):
327327
)
328328
assert not isfile(file_path)
329329
with mock.patch(
330-
"PySide2.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
330+
"qtpy.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
331331
):
332332
# To trigger the slot
333333
self.widget.w_step.b_export.clicked.emit()
@@ -437,7 +437,7 @@ def test_Railway(self):
437437

438438
assert self.widget.w_step.test_err_msg is None
439439
with mock.patch(
440-
"PySide2.QtWidgets.QMessageBox.critical",
440+
"qtpy.QtWidgets.QMessageBox.critical",
441441
return_value=QtWidgets.QMessageBox.Ok,
442442
):
443443
self.widget.w_step.b_plot.clicked.emit()
@@ -673,7 +673,7 @@ def test_Railway(self):
673673
res_path = join(save_path, "Simu_Results")
674674
makedirs(res_path)
675675
with mock.patch(
676-
"PySide2.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
676+
"qtpy.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
677677
):
678678
# To trigger the slot
679679
self.widget.w_step.w_path_result.b_path.clicked.emit()
@@ -686,7 +686,7 @@ def test_Railway(self):
686686

687687
## Run
688688
assert len(listdir(res_path)) == 0
689-
with mock.patch("PySide2.QtWidgets.QMessageBox.information", return_value=None):
689+
with mock.patch("qtpy.QtWidgets.QMessageBox.information", return_value=None):
690690
self.widget.w_step.b_next.clicked.emit()
691691
# Run creates a new results folder with execution time in the name
692692
assert len(listdir(res_path)) == 1

‎Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Zoe.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from os import makedirs, listdir
77
from numpy import max as np_max
88

9-
from PySide2 import QtWidgets
9+
from qtpy import QtWidgets
1010
import mock
1111
import pytest
1212
from pyleecan.Classes.MachineWRSM import MachineWRSM
@@ -159,7 +159,7 @@ def test_Zoe(self):
159159
## Initial state
160160
assert self.widget.w_step.test_err_msg is None
161161
with mock.patch(
162-
"PySide2.QtWidgets.QMessageBox.critical",
162+
"qtpy.QtWidgets.QMessageBox.critical",
163163
return_value=QtWidgets.QMessageBox.Ok,
164164
):
165165
self.widget.w_step.b_plot.clicked.emit()
@@ -330,7 +330,7 @@ def test_Zoe(self):
330330
)
331331
assert not isfile(file_path)
332332
with mock.patch(
333-
"PySide2.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
333+
"qtpy.QtWidgets.QFileDialog.getSaveFileName", return_value=return_value
334334
):
335335
# To trigger the slot
336336
self.widget.w_step.b_export.clicked.emit()
@@ -463,7 +463,7 @@ def test_Zoe(self):
463463

464464
assert self.widget.w_step.test_err_msg is None
465465
with mock.patch(
466-
"PySide2.QtWidgets.QMessageBox.critical",
466+
"qtpy.QtWidgets.QMessageBox.critical",
467467
return_value=QtWidgets.QMessageBox.Ok,
468468
):
469469
self.widget.w_step.b_plot.clicked.emit()
@@ -772,7 +772,7 @@ def test_Zoe(self):
772772
res_path = join(save_path, "Simu_Results")
773773
makedirs(res_path)
774774
with mock.patch(
775-
"PySide2.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
775+
"qtpy.QtWidgets.QFileDialog.getExistingDirectory", return_value=res_path
776776
):
777777
# To trigger the slot
778778
self.widget.w_step.w_path_result.b_path.clicked.emit()
@@ -787,7 +787,7 @@ def test_Zoe(self):
787787

788788
## Run
789789
assert len(listdir(res_path)) == 0
790-
with mock.patch("PySide2.QtWidgets.QMessageBox.information", return_value=None):
790+
with mock.patch("qtpy.QtWidgets.QMessageBox.information", return_value=None):
791791
self.widget.w_step.b_next.clicked.emit()
792792
# Run creates a new results folder with execution time in the name
793793
assert len(listdir(res_path)) == 1

‎Tests/GUI/Dialog/DMachineSetup/PHole/test_PHoleM50.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from random import uniform
55

66
import pytest
7-
from PySide2 import QtWidgets
8-
from PySide2.QtTest import QTest
7+
from qtpy import QtWidgets
8+
from qtpy.QtTest import QTest
99
from Tests.GUI import gui_option # Set unit as [m]
1010
from pyleecan.Classes.HoleM50 import HoleM50
1111
from pyleecan.Classes.LamHole import LamHole

0 commit comments

Comments
 (0)