Update streamlit script to capture ModuleNotFoundError

man-group · Feb 22, 2023 · a53d91f · a53d91f
1 parent 3955e2b
commit a53d91f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -129,6 +129,8 @@ python: &python
             if [ "${CIRCLE_JOB}" == "build_3_10" ]; then
               pip install pybind11
               pip install -r requirements.txt
+            elif [  "${CIRCLE_JOB}" == "build_3_6" ]; then
+              pip install -r requirements.txt
             fi
             python setup.py develop
       - run:

diff --git a/dtale/cli/streamlit_script.py b/dtale/cli/streamlit_script.py
@@ -1,12 +1,12 @@
 try:
     import streamlit.server.server as streamlit_server
-except ImportError:
+except BaseException:  # ImportError, ModuleNotFoundError
     import streamlit.web.server.server as streamlit_server
 import sys
 
 try:
     from streamlit.cli import main
-except ImportError:
+except BaseException:
     from streamlit.web.cli import main
 from tornado.wsgi import WSGIContainer
 from tornado.web import FallbackHandler

diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,8 @@ dash==1.21.0; python_version == '2.7'
 dash==2.0.0; python_version == '3.6'
 dash>=2.0.0; python_version > '3.6'
 dash-bootstrap-components<=0.10.5; python_version < '3.0'
-dash-bootstrap-components; python_version > '3.0'
+dash-bootstrap-components==1.2.1; python_version == '3.6'
+dash-bootstrap-components<=1.3.1; python_version > '3.6'
 dash-colorscales
 dash_daq
 decorator==4.4.2; python_version == '2.7'
@@ -45,7 +46,7 @@ matplotlib==3.3.4; python_version == '3.6'
 matplotlib==3.5.3; python_version == '3.7'
 matplotlib==3.6.0; python_version == '3.8'
 matplotlib==3.6.0; python_version == '3.9'
-matplotlib; python_version > '3.9'
+matplotlib<=3.6.3; python_version > '3.9'
 missingno<=0.4.2
 networkx==2.2; python_version <= '3.4'
 networkx==2.4; python_version == '3.5'
@@ -68,8 +69,8 @@ pillow==8.4.0; python_version == '3.6'
 plotly==4.14.3; python_version < '3.6'
 plotly>=5.0.0; python_version >= '3.6'
 pyparsing==2.4.7; python_version == '2.7'
-requests; python_version >= '3.6'
-requests==2.27.1; python_version == '2.7'
+requests; python_version >= '3.7'
+requests==2.27.1; python_version <= '3.6'
 scikit-learn==0.20.4; python_version < '3.0'
 scikit-learn==0.24.2; python_version == '3.6'
 scikit-learn==1.0.2; python_version == '3.7'