Skip to content

Commit b396dc2

Browse files
committed
Upgrade guidata/PlotPy versions
1 parent 3b15eae commit b396dc2

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

cdl/core/gui/main.py

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -829,14 +829,9 @@ def __add_signal_panel(self) -> None:
829829
plot.add_item(make.legend("TR"))
830830
self.signalpanel = signal.SignalPanel(self, dpw.plotwidget, self.signal_toolbar)
831831
self.signalpanel.SIG_STATUS_MESSAGE.connect(self.statusBar().showMessage)
832-
try:
833-
plot.SIG_ITEM_PARAMETERS_CHANGED.connect(
834-
self.signalpanel.plot_item_parameters_changed
835-
)
836-
except AttributeError:
837-
# PlotPy < 2.2: SIG_ITEM_PARAMETERS_CHANGED does not exist, so we pass
838-
# (this affects the plot item parameters persistence feature)
839-
pass
832+
plot.SIG_ITEM_PARAMETERS_CHANGED.connect(
833+
self.signalpanel.plot_item_parameters_changed
834+
)
840835
return dpw
841836

842837
def __add_image_panel(self) -> None:
@@ -857,14 +852,9 @@ def __add_image_panel(self) -> None:
857852
# cspanel.peritem_ac.setChecked(False)
858853
# -----------------------------------------------------------------------------
859854
self.imagepanel.SIG_STATUS_MESSAGE.connect(self.statusBar().showMessage)
860-
try:
861-
plot.SIG_ITEM_PARAMETERS_CHANGED.connect(
862-
self.imagepanel.plot_item_parameters_changed
863-
)
864-
except AttributeError:
865-
# PlotPy < 2.2: SIG_ITEM_PARAMETERS_CHANGED does not exist, so we pass
866-
# (this affects the plot item parameters persistence feature)
867-
pass
855+
plot.SIG_ITEM_PARAMETERS_CHANGED.connect(
856+
self.imagepanel.plot_item_parameters_changed
857+
)
868858
return dpw
869859

870860
def __update_tab_menu(self) -> None:

doc/requirements.rst

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ The :mod:`cdl` package requires the following Python modules:
3232
- >= 5.5
3333
-
3434
* - guidata
35-
- >= 3.2
35+
- >= 3.4
3636
-
3737
* - PlotPy
38-
- >= 2.0
38+
- >= 2.3
3939
-
4040
* - QtPy
4141
- >= 1.9
@@ -101,4 +101,20 @@ Optional modules for building the documentation:
101101
- Add a copy button to each of your code cells.
102102
* - pydata-sphinx-theme
103103
-
104-
- Bootstrap-based Sphinx theme from the PyData community
104+
- Bootstrap-based Sphinx theme from the PyData community
105+
106+
Optional modules for running test suite:
107+
108+
.. list-table::
109+
:header-rows: 1
110+
:align: left
111+
112+
* - Name
113+
- Version
114+
- Summary
115+
* - pytest
116+
-
117+
- pytest: simple powerful testing with Python
118+
* - pytest-xvfb
119+
-
120+
- A pytest plugin to run Xvfb (or Xephyr/Xvnc) for tests.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ dependencies = [
4545
"opencv-python-headless >= 4.5",
4646
"PyWavelets >= 1.1",
4747
"psutil >= 5.5",
48-
"guidata >= 3.2",
49-
"PlotPy >= 2.0",
48+
"guidata >= 3.4",
49+
"PlotPy >= 2.3",
5050
"QtPy >= 1.9",
5151
]
5252
dynamic = ["version"]

0 commit comments

Comments
 (0)