Merge pull request #25 from NCTraCSIDSci/npmBumps

Bump some npm package versions and python libraries.

clarkproc/requirements-dev.txt

@@ -1,2 +1,2 @@
-PyInstaller==3.5
+PyInstaller==4.3
 pre-commit

clarkproc/requirements.txt

@@ -3,7 +3,7 @@ appdirs==1.4.3
 attrs==19.3.0
 Click==7.0
 fhir.resources==5.0.1
-flasgger==0.9.3
+flasgger==0.9.5
 Flask==1.1.1
 isodate==0.6.0
 itsdangerous==1.1.0
@@ -18,7 +18,7 @@ pyrsistent==0.15.6
 python-dateutil==2.8.1
 pytz==2019.3
 PyYAML==5.2
-scikit-learn==0.21.2
-scipy==1.3.0
+scikit-learn==0.24.2
+scipy==1.6.3
 six==1.13.0
 Werkzeug==0.16.0

clarkproc/server.spec

@@ -1,10 +1,5 @@
 # -*- mode: python ; coding: utf-8 -*-
 
-# work-around for https://github.com/pyinstaller/pyinstaller/issues/4064
-import distutils
-if distutils.distutils_path.endswith('__init__.py'):
-    distutils.distutils_path = os.path.dirname(distutils.distutils_path)
-
 block_cipher = None
 
 a = Analysis(['./clarkproc/server_app.py'],
@@ -20,7 +15,12 @@ a = Analysis(['./clarkproc/server_app.py'],
                 'sklearn.tree._utils',
                 'sklearn.utils._cython_blas',
                 'sklearn.metrics.cluster',
-                'pkg_resources.py2_warn'
+                'pkg_resources.py2_warn',
+                'sklearn.utils.sparsetools._graph_validation',
+                'sklearn.utils.sparsetools._graph_tools',
+                'sklearn.utils.lgamma',
+                'sklearn.utils.weight_vector',
+                'sklearn.utils._weight_vector'
              ],
              hookspath=[],
              runtime_hooks=[],