Merge tag '3.34.1' into stable

biolab · Dec 13, 2022 · 0e3b4a1 · 0e3b4a1
2 parents 4583669 + bb4fc5b
commit 0e3b4a1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ Change Log
 [next] - TBA
 ------------
 
+
+[3.34.1] - 2022-12-13
+--------------------
+#### Bugfixes
+* Pin scikit-learn requirement to <1.2.0 due to changes in PCA
+
+
 [3.34.0] - 2022-12-05
 --------------------
 ##### Enhancements
@@ -1728,7 +1735,8 @@ Change Log
 * Initial version based on Python 1.5.2 and Qt 2.3
 
 
-[next]: https://github.com/biolab/orange3/compare/3.34.0...HEAD
+[next]: https://github.com/biolab/orange3/compare/3.34.1..HEAD
+[3.34.1]: https://github.com/biolab/orange3/compare/3.34.0...3.34.1
 [3.34.0]: https://github.com/biolab/orange3/compare/3.33.0...3.34.0
 [3.33.0]: https://github.com/biolab/orange3/compare/3.32.0...3.33.0
 [3.32.0]: https://github.com/biolab/orange3/compare/3.31.1...3.32.0

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -40,7 +40,7 @@ requirements:
     - setuptools >=41.0.0
     - numpy >=1.19.5
     - scipy >=1.9
-    - scikit-learn >=1.0.1
+    - scikit-learn >=1.0.1,<1.2.0
     - bottleneck >=1.3.4
     - chardet >=3.0.2
     - xlrd >=1.2.0

diff --git a/requirements-core.txt b/requirements-core.txt
@@ -3,7 +3,7 @@ numpy>=1.19.5
 scipy>=1.9
 # scikit-learn version 1.0.0 includes problematic libomp 12 which breaks xgboost
 # https://github.com/scikit-learn/scikit-learn/pull/21227
-scikit-learn>=1.0.1
+scikit-learn>=1.0.1,<1.2.0
 bottleneck>=1.3.4
 # Reading Excel files
 xlrd>=1.2.0

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 
 NAME = 'Orange3'
 
-VERSION = '3.34.0'
+VERSION = '3.34.1'
 ISRELEASED = True
 # full version identifier including a git revision identifier for development
 # build/releases (this is filled/updated in `write_version_py`)