requiring verison 1.3 for sklearn to avoid issues with people not doi…

…ng conda upgrade all
PennyWieser · Dec 26, 2023 · b09ccbb · b09ccbb
1 parent be5e5f5
commit b09ccbb
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 126 deletions.
diff --git a/Benchmarking/Add_ons/fo2_magmasattest.ipynb b/Benchmarking/Add_ons/fo2_magmasattest.ipynb
diff --git a/Benchmarking/Add_ons/fo2weirdness.png b/Benchmarking/Add_ons/fo2weirdness.png
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -1,11 +1,23 @@
 ================================================
 Change Log
 ================================================
+Version 1.0.36 - Dec 26th, 2023
+=====================================
+After numerous issues with peoples old (2020-2021 sklearn issues, have required 1.3 onwards in setup.py file now. )
+
+
+Version 1.0.31 to Version 1.0.34 - Dec, 2023
+=====================================
+Fixing additional issues related to pandas2 and shift to csv file paths.
 
 
 Version 1.0.31 - November 17th, 2023
 =====================================
-Sorted issues with .pkl incompatability for calibration datasets by resaving all as csv files and loading those. 
+Sorted issues with .pkl incompatability for calibration datasets by resaving all as csv files and loading those.
+
+Version 1.0.31 - November 17th, 2023
+=====================================
+Sorted issues with .pkl incompatability for calibration datasets by resaving all as csv files and loading those.
 
 Version 1.0.30 - October 6th, 2023
 =====================================

diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
             'numpy',
             'python-ternary',
             'matplotlib',
-            'scikit-learn',
+            'scikit-learn>=1.3',
             'scipy',
             'tqdm',
             'statsmodels',

diff --git a/src/Thermobar/Masotta_2013_Cali_input.csv b/src/Thermobar/Masotta_2013_Cali_input.csv
diff --git a/src/Thermobar/_version.py b/src/Thermobar/_version.py
@@ -5,4 +5,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module
-__version__ = '1.0.35'
+__version__ = '1.0.36'