From 9bbe228dd44de3db2e1fb37a9b5e604d6a11bbf0 Mon Sep 17 00:00:00 2001
From: lhenry15 <khlai037@gmail.com>
Date: Wed, 9 Sep 2020 14:47:30 -0500
Subject: [PATCH] resolve requirement conflicts

Former-commit-id: 80a15f96fc16df4663c1f0bec223e32a3e191ce3 [formerly 0167c2687eb8c894d46744be0d5e37f0f95576df] [formerly 22ea246ee2f4e6ce3c62822554b79c0973e4e58c [formerly 97a888d0a2c1de37eb609945341a00cdc6d2d5bb]] [formerly 5abf42067e51d835be0f4055c51c8d45a63416b2 [formerly b2c978a671b5957f09c99fbabe9b8656674705bf] [formerly d5e7459f16105fac6a6c1149a2c72dbe2f73846d [formerly 0953fba2e6f3171d1f001c480c2fc11860bc297a]]] [formerly 31de63c2df6d407f625eb90571000514e2036146 [formerly 3c1e0a250611a2108378abf4f3f6cd786fe88bbb] [formerly 2722ac425f97624173bbc956ee0050adb2ec076d [formerly bd49ecd601e48d510f8ab769f1fb761243aa860f]] [formerly 8a759dfc24f53ab14115bac2697095b9a5da76d6 [formerly 82bd40b0eec500651864742948090e5535442542] [formerly 398c6b30a8fe469e004735b13474ccdebf605995 [formerly ab4445744804b7003b0826d0ff844c10912ea0b1]]]]
Former-commit-id: df6a386428935431f75b5f30d4de1161d3549e19 [formerly 6b6e2abd058bd745f1aab0168402deca0ebfe76a] [formerly 9aed59f7b0f5bf6aeb7457ac88a8ff7ffe5b4fe7 [formerly ef7999768b820ed0df9e00139769e665ab505ff8]] [formerly 8d460de64eb7616d34eaa9215e421d72cbbf199b [formerly 35e0f15fd000cb174cb3d88fc8c313a4a46dcdb2] [formerly 398c6b30a8fe469e004735b13474ccdebf605995]]
Former-commit-id: ff8815ca9ce1d7174c77e061e3fe6068e06a8760 [formerly 6c87c94abbcb012ebb0f2a47e58fe9b9703d3262] [formerly 72574b68903a364e32d1cc3095700a5c6090b18f [formerly f3e454c543b9625fde2aa93a6a3ef2543049c66b]]
Former-commit-id: dc1d3978d4c6523394ff420c735c139538aff400 [formerly 43ec6c2928be31f9f0ad3ad336e85cf12fb3d7b8]
Former-commit-id: 2fc4d61e8dd90ee8d04c65b40d357742479d82c7
---
 requirements.txt                                     | 4 ++--
 tods/common-primitives/sklearn-wrap/requirements.txt | 4 ++--
 tods/common-primitives/sklearn-wrap/setup.py         | 2 +-
 tods/requirements.txt                                | 4 ++--
 tods/setup.py                                        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a6bcea0..29511aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-scikit-learn==0.21.3
+scikit-learn==0.22.0
 pytypes==1.0b5
 frozendict==1.2
 numpy>=1.15.4,<=1.18.1
@@ -9,7 +9,7 @@ rfc3987==1.3.8
 webcolors>=1.8.1,<=1.10
 dateparser>=0.7.0,<=0.7.2
 python-dateutil==2.8.1
-pandas==0.23.4
+pandas==0.25
 typing-inspect==0.5.0
 GitPython==3.1.0
 jsonpath-ng==1.4.3
diff --git a/tods/common-primitives/sklearn-wrap/requirements.txt b/tods/common-primitives/sklearn-wrap/requirements.txt
index d587988..fccd5e8 100644
--- a/tods/common-primitives/sklearn-wrap/requirements.txt
+++ b/tods/common-primitives/sklearn-wrap/requirements.txt
@@ -1,4 +1,4 @@
-scikit-learn==0.21.3
+scikit-learn==0.22.0
 pytypes==1.0b5
 frozendict==1.2
 numpy>=1.15.4,<=1.18.1
@@ -9,7 +9,7 @@ rfc3987==1.3.8
 webcolors>=1.8.1,<=1.10
 dateparser>=0.7.0,<=0.7.2
 python-dateutil==2.8.1
-pandas==0.23.4
+pandas==0.25
 typing-inspect==0.5.0
 GitPython>=2.1.11,<=3.0.5
 jsonpath-ng==1.4.3
diff --git a/tods/common-primitives/sklearn-wrap/setup.py b/tods/common-primitives/sklearn-wrap/setup.py
index a8f506e..0090ec8 100644
--- a/tods/common-primitives/sklearn-wrap/setup.py
+++ b/tods/common-primitives/sklearn-wrap/setup.py
@@ -25,7 +25,7 @@ setup(
         'd3m',
         'Jinja2==2.9.4',
         'simplejson==3.12.0',
-        'scikit-learn==0.21.3',
+        'scikit-learn==0.22.0',
     ],
     url='https://gitlab.datadrivendiscovery.org/jpl/sklearn-wrapping',
     entry_points = {
diff --git a/tods/requirements.txt b/tods/requirements.txt
index d587988..379a1cb 100644
--- a/tods/requirements.txt
+++ b/tods/requirements.txt
@@ -1,4 +1,4 @@
-scikit-learn==0.21.3
+scikit-learn==0.22.0
 pytypes==1.0b5
 frozendict==1.2
 numpy>=1.15.4,<=1.18.1
@@ -9,7 +9,7 @@ rfc3987==1.3.8
 webcolors>=1.8.1,<=1.10
 dateparser>=0.7.0,<=0.7.2
 python-dateutil==2.8.1
-pandas==0.23.4
+pandas==0.25.0
 typing-inspect==0.5.0
 GitPython>=2.1.11,<=3.0.5
 jsonpath-ng==1.4.3
diff --git a/tods/setup.py b/tods/setup.py
index 4aa078c..83b72e2 100644
--- a/tods/setup.py
+++ b/tods/setup.py
@@ -29,7 +29,7 @@ setup(
         'd3m',
         'Jinja2',
         'simplejson==3.12.0',
-        'scikit-learn==0.21.3',
+        'scikit-learn==0.22.0',
 	'statsmodels==0.11.1',
         'PyWavelets>=1.1.1',
         'tensorflow', # should be removed later