Skip to content

Commit 1862d79

Browse files
committed
Limit scikit-learn requirement to <0.23
1 parent befc990 commit 1862d79

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

Orange/base.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -523,11 +523,7 @@ def _get_sklparams(self, values):
523523
spec = list(
524524
inspect.signature(skllearner.__init__).parameters.keys()
525525
)
526-
# first argument is 'self'
527-
assert spec[0] == "self"
528-
params = {
529-
name: values[name] for name in spec[1:] if name in values
530-
}
526+
params = {name: values[name] for name in spec if name in values}
531527
else:
532528
raise TypeError("Wrapper does not define '__wraps__'")
533529
return params

Orange/projection/base.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,7 @@ def _get_sklparams(self, values):
199199
spec = list(
200200
inspect.signature(sklprojection.__init__).parameters.keys()
201201
)
202-
# first argument is 'self'
203-
assert spec[0] == "self"
204-
params = {
205-
name: values[name] for name in spec[1:] if name in values
206-
}
202+
params = {name: values[name] for name in spec if name in values}
207203
else:
208204
raise TypeError("Wrapper does not define '__wraps__'")
209205
return params

requirements-core.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pip>=9.0
22
numpy>=1.16.0
33
scipy>=0.16.1
4-
scikit-learn>=0.22.0
4+
scikit-learn>=0.22.0,<0.23 # TODO: release when fixed: https://github.com/scikit-learn/scikit-learn/issues/17208
55
bottleneck>=1.0.0
66
# Reading Excel files
77
xlrd>=0.9.2

0 commit comments

Comments
 (0)