resolve requirement conflicts

Former-commit-id: 80a15f96fc [formerly 0167c2687e] [formerly 22ea246ee2 [formerly 97a888d0a2]] [formerly 5abf42067e [formerly b2c978a671] [formerly d5e7459f16 [formerly 0953fba2e6]]] [formerly 31de63c2df [formerly 3c1e0a2506] [formerly 2722ac425f [formerly bd49ecd601]] [formerly 8a759dfc24 [formerly 82bd40b0ee] [formerly 398c6b30a8 [formerly ab44457448]]]]
Former-commit-id: df6a386428 [formerly 6b6e2abd05] [formerly 9aed59f7b0 [formerly ef7999768b]] [formerly 8d460de64e [formerly 35e0f15fd0] [formerly 398c6b30a8]]
Former-commit-id: ff8815ca9c [formerly 6c87c94abb] [formerly 72574b6890 [formerly f3e454c543]]
Former-commit-id: dc1d3978d4 [formerly 43ec6c2928]
Former-commit-id: 2fc4d61e8d

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

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

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 = {

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

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