From fc72464f6b35746be6d73a1b6fec9cd8cc2a8406 Mon Sep 17 00:00:00 2001 From: Vesna Tanko Date: Mon, 19 Feb 2024 11:09:47 +0100 Subject: [PATCH 1/3] PLS: Deprecate widget --- conda/meta.yaml | 2 +- orangecontrib/spectroscopy/widgets/owpls.py | 3 +++ setup.py | 2 +- tox.ini | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index be1d15c43..424e4d10d 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -24,7 +24,7 @@ requirements: run: - python >=3.8 - numpy >=1.21.0,<2.0.0 - - orange3 >=3.34.0 + - orange3 >=3.37.0 - orange-canvas-core >=0.1.28 - orange-widget-base >=4.19.0 - scipy >=1.9.0 diff --git a/orangecontrib/spectroscopy/widgets/owpls.py b/orangecontrib/spectroscopy/widgets/owpls.py index b1d44e61f..e1230bf35 100644 --- a/orangecontrib/spectroscopy/widgets/owpls.py +++ b/orangecontrib/spectroscopy/widgets/owpls.py @@ -27,11 +27,14 @@ class Outputs(OWBaseLearner.Outputs): class Warning(OWBaseLearner.Warning): sparse_data = Msg('Sparse input data: default preprocessing is to scale it.') + deprecated = Msg('The PLS widget is deprecated and will be removed in the future.\n' + 'You can use a PLS widget in the core Orange instead.') n_components = Setting(2) max_iter = Setting(500) def add_main_layout(self): + self.Warning.deprecated() self.optimization_box = gui.vBox( self.controlArea, "Optimization Parameters") diff --git a/setup.py b/setup.py index 987f23927..0ebfab92d 100644 --- a/setup.py +++ b/setup.py @@ -128,7 +128,7 @@ def include_documentation(local_dir, install_dir): 'setuptools>=36.3', # same as for Orange 3.28 'pip>=9.0', # same as for Orange 3.28 'numpy>=1.21.0,<2.0.0', - 'Orange3>=3.34.0', + 'Orange3>=3.37.0', 'orange-canvas-core>=0.1.28', 'orange-widget-base>=4.19.0', 'scipy>=1.9.0', diff --git a/tox.ini b/tox.ini index 8b19afa1f..8fdd3b48c 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ setenv = deps = {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} - oldest: orange3==3.34.0 + oldest: orange3==3.37.0 oldest: orange-canvas-core==0.1.28 oldest: orange-widget-base==4.19.0 oldest: scikit-learn~=1.0.1 From 0435a9c6fc00e31baf278263ebf78e732a3ba33d Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Wed, 20 Nov 2024 19:58:42 +0100 Subject: [PATCH 2/3] pls: rewrite deprecation warning --- orangecontrib/spectroscopy/widgets/owpls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orangecontrib/spectroscopy/widgets/owpls.py b/orangecontrib/spectroscopy/widgets/owpls.py index e1230bf35..64cd0fb82 100644 --- a/orangecontrib/spectroscopy/widgets/owpls.py +++ b/orangecontrib/spectroscopy/widgets/owpls.py @@ -28,7 +28,7 @@ class Outputs(OWBaseLearner.Outputs): class Warning(OWBaseLearner.Warning): sparse_data = Msg('Sparse input data: default preprocessing is to scale it.') deprecated = Msg('The PLS widget is deprecated and will be removed in the future.\n' - 'You can use a PLS widget in the core Orange instead.') + 'Please use the PLS widget from the Model category instead.') n_components = Setting(2) max_iter = Setting(500) From d91fe5457971925e83e6bc9af72b9ca10a3a1b8b Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Wed, 20 Nov 2024 19:57:07 +0100 Subject: [PATCH 3/3] update dependencies for Orange 3.37.0 --- conda/meta.yaml | 10 +++++----- setup.py | 10 +++++----- tox.ini | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 424e4d10d..415174ea8 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,14 +25,14 @@ requirements: - python >=3.8 - numpy >=1.21.0,<2.0.0 - orange3 >=3.37.0 - - orange-canvas-core >=0.1.28 - - orange-widget-base >=4.19.0 + - orange-canvas-core >=0.2.0 + - orange-widget-base >=4.23.0 - scipy >=1.9.0 - - scikit-learn>=1.0.1 + - scikit-learn>=1.3.0 - spectral >=0.22.3,!=0.23 - serverfiles >=0.2 - - AnyQt >=0.1.0 - - pyqtgraph >=0.12.2,!=0.12.4 + - AnyQt >=0.2.0 + - pyqtgraph >=0.13.1 - colorcet - h5py - extranormal3 >=0.0.3 diff --git a/setup.py b/setup.py index 0ebfab92d..ec01938d8 100644 --- a/setup.py +++ b/setup.py @@ -129,14 +129,14 @@ def include_documentation(local_dir, install_dir): 'pip>=9.0', # same as for Orange 3.28 'numpy>=1.21.0,<2.0.0', 'Orange3>=3.37.0', - 'orange-canvas-core>=0.1.28', - 'orange-widget-base>=4.19.0', + 'orange-canvas-core>=0.2.0', + 'orange-widget-base>=4.23.0', 'scipy>=1.9.0', - 'scikit-learn>=1.0.1', + 'scikit-learn>=1.3.0', 'spectral>=0.22.3,!=0.23', 'serverfiles>=0.2', - 'AnyQt>=0.1.0', - 'pyqtgraph>=0.12.2,!=0.12.4', # https://github.com/pyqtgraph/pyqtgraph/issues/2237 + 'AnyQt>=0.2.0', + 'pyqtgraph>=0.13.1', 'colorcet', 'h5py', 'extranormal3 >=0.0.3', diff --git a/tox.ini b/tox.ini index 8fdd3b48c..d218b3221 100644 --- a/tox.ini +++ b/tox.ini @@ -22,13 +22,13 @@ deps = {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} oldest: orange3==3.37.0 - oldest: orange-canvas-core==0.1.28 - oldest: orange-widget-base==4.19.0 - oldest: scikit-learn~=1.0.1 + oldest: orange-canvas-core==0.2.0 + oldest: orange-widget-base==4.23.0 + oldest: scikit-learn~=1.3.0 oldest: numpy~=1.21.0 - oldest: pyqtgraph==0.12.2 + oldest: pyqtgraph==0.13.1 oldest: scipy~=1.9.0 - oldest: pandas~=1.3.0 + oldest: pandas~=1.4.0 oldest: spectral~=0.22.3 oldest: lmfit==1.3.2 oldest: pillow==9.0.0