From 475a94c46f733b44c9014c04eda9ae5d082d27bd Mon Sep 17 00:00:00 2001
From: Vovan Kuznetsov <vovan@kronologic.ai>
Date: Thu, 13 May 2021 21:25:57 -0500
Subject: [PATCH 1/2] Fix to work with newer version of scikit-learn

---
 setup.py                               |   6 +++---
 talon/signature/data/classifier        | Bin 608 -> 799 bytes
 talon/signature/learning/classifier.py |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index f55fc3b7..70b55a91 100755
--- a/setup.py
+++ b/setup.py
@@ -46,9 +46,9 @@ def finalize_options(self):
       install_requires=[
           "lxml>=2.3.3",
           "regex>=1",
-          "numpy",
-          "scipy",
-          "scikit-learn==0.16.1", # pickled versions of classifier, else rebuild
+          "numpy==1.20.1",
+          "scikit-learn==0.24.1",
+          "scipy==1.6.2",
           'chardet>=1.0.1',
           'cchardet>=0.3.5',
           'cssselect',
diff --git a/talon/signature/data/classifier b/talon/signature/data/classifier
index 1c3a4b0865f3e951b1b3b17fb31bacc48d8d005b..99bee3824c44f25c313422a41a95f981737a1370 100644
GIT binary patch
literal 799
zcmZWn%S%*I7@wzivN5s;MB2+FHS$toVo+Rj7DBg%D5y<wI5Ts`bL+mk=U#Qlq6p34
zTL^u#i2j3il8ZKBZG)gih6J^cpoc{oElPqqb7xe-vpCQ1`+dLj`+c_(<*8^S9I#DX
zH5v76RSa1w$(vLNCJ;89Hf(u){z3-tW5;d0f$fke1k}U{i2II-1KQ4>`Gw|8Cqy$i
z(AQdn+h_%*Z&Yy*;?9tV&`>mdV%R?O^33%mK;!Cxh&(k7dl2;~q{HH5m>GlI$1EsA
z%*#1~p&o&>N9}@R5#dvx$+wh6M~ER2@yw?<C@!<9>6Z{<W*0)jbcFmugSZw@j}-`)
z1sK96n-m%K1CI&GhM=B?RPDb6Ve1tqXBs)x4lK7sTq7@KL1@fYjwd~jmM(hKb!EX-
zIZ`6Xh4~1{FbhGk3$zj|gCHq5btU=OnA|&FL8fvAk_EpcZ+SCskukAiFW#HDi|4Ri
zk3;l0X0zE-f8_`#J>p{y>Zxfu!^E<vixWYvs`KJZZPm&h)m;RVd50AV@*P#XcoW~v
z_vleQJ&t@IS9l9Qz&j+uys~#x|M^2p4VEWUy@_Z2AK!hoUj5P9w(R=+_QjI+<n`Rk
zzPTl>>4bK6cI1op{bngS`(ROf|LgM9^M}jY<cC;iXV24_--~Y=++&Yd*U^JVTc?#}
zt$b*OQT>|F>u8PrPwLzBqf7lQ3p3^GE6Iu-8Z52Z9;&P69gnGDdsQ`tx=QoViX(hK
r#EkAWDS6v^Av1|P@kj*6rP#2U)ViL?9utORBh(#MySmjQ806G{m<Bx9

literal 608
zcmZut%Z}496iu5B4QUIMH^cBApu;1A0kJ{?RHTszlf|G5OUp^!iNSGlZKq5Ym0$z&
zReTI9Bt8OMchm*qE-d-#yzcqZ&h#h2sFIPM6;URr)=Y<QxwN}?@5do}TVJs?$My(1
zqSP9F7-+1iViS^cxzDfztue0cyxjEMKyV~N@YqV59T=u06*~G@rh=!Dtc$8470;}B
zn7n?a6m32zT2)Mi*tM3y9FLD6&~@tMFw7h!loPtZhS-B($_10OVAzMDL-8qRiadH8
z$*RFYokDlUR9b3=Ct?qVT-p>Fs|?W@6*fGcj9bu|)KuW9Ll{iCAu9|H4<RV%0pXT}
zr+0t((3S2(@XRtyl$DA_MJ)_phFZu{d%)SFuoKf%EW~rr=1=i_?8U9`cwrAOj$$8L
z&+$@{ByaxMaZl_STu-6%!}mPA{0%qu@CtM*d!aB5UWK;U#%s`Xc4S$~b@0oX!W+<6
zR8Go*XhRLdn+f=)6nJar#rm_Kzc<DYVJ$1!l;CE*==Sy;?~L*=@8$m#x9y6%Yl{n4
hJrEo@($*aB{g?E_k?vbk-=!j-8Q;$hK1k{``U^Y((T)HB

diff --git a/talon/signature/learning/classifier.py b/talon/signature/learning/classifier.py
index 0519713d..55863a39 100644
--- a/talon/signature/learning/classifier.py
+++ b/talon/signature/learning/classifier.py
@@ -8,8 +8,8 @@
 from __future__ import absolute_import
 
 from numpy import genfromtxt
-from sklearn.externals import joblib
 from sklearn.svm import LinearSVC
+import joblib
 
 
 def init():

From 4770a84f596021c3b9b6f428fc3532956e82f501 Mon Sep 17 00:00:00 2001
From: Volodymyr Kuznetsov <vovanec@gmail.com>
Date: Fri, 7 Jan 2022 15:59:53 -0600
Subject: [PATCH 2/2] Update setup.py

Bumped bumpy version
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 70b55a91..7c7ea4b5 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def finalize_options(self):
       install_requires=[
           "lxml>=2.3.3",
           "regex>=1",
-          "numpy==1.20.1",
+          "numpy>=1.20.1",
           "scikit-learn==0.24.1",
           "scipy==1.6.2",
           'chardet>=1.0.1',