Skip to content

Commit

Permalink
Merge pull request #711 from VesnaT/deprecate_pls
Browse files Browse the repository at this point in the history
PLS: Deprecate widget
  • Loading branch information
markotoplak authored Nov 20, 2024
2 parents 573a641 + d91fe54 commit 9008270
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 18 deletions.
12 changes: 6 additions & 6 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ requirements:
run:
- python >=3.8
- numpy >=1.21.0,<2.0.0
- orange3 >=3.34.0
- orange-canvas-core >=0.1.28
- orange-widget-base >=4.19.0
- orange3 >=3.37.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
Expand Down
3 changes: 3 additions & 0 deletions orangecontrib/spectroscopy/widgets/owpls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'Please use the PLS widget from the Model category 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")
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ 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',
'orange-canvas-core>=0.1.28',
'orange-widget-base>=4.19.0',
'Orange3>=3.37.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',
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ 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: orange-canvas-core==0.1.28
oldest: orange-widget-base==4.19.0
oldest: scikit-learn~=1.0.1
oldest: orange3==3.37.0
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
Expand Down

0 comments on commit 9008270

Please sign in to comment.