1.7.9

- added support for google colab using flask_ngrok
- bugfixes for  #73, #72, #71

Author: Andrew Schonfeld

.circleci/config.yml

@@ -5,7 +5,7 @@ defaults: &defaults
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       CODECOV_TOKEN: b0d35139-0a75-427a-907b-2c78a762f8f0
-      VERSION: 1.7.8
+      VERSION: 1.7.9
       PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
     steps:
     - checkout

CHANGES.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 1.7.9 (2020-2-24)
+ * support for google colab
+ * bugfixes: [#71](https://github.com/man-group/dtale/issues/71), [#72](https://github.com/man-group/dtale/issues/72), [#73](https://github.com/man-group/dtale/issues/73)
+
 ### 1.7.8 (2020-2-22)
  * [#77](https://github.com/man-group/dtale/issues/77), removal of multiprocessed timeouts
 

docker/2_7/Dockerfile

@@ -44,4 +44,4 @@ WORKDIR /app
 
 RUN set -eux \
   ; . /root/.bashrc \
-  ; easy_install dtale-1.7.8-py2.7.egg
+  ; easy_install dtale-1.7.9-py2.7.egg

docker/3_6/Dockerfile

@@ -44,4 +44,4 @@ WORKDIR /app
 
 RUN set -eux \
   ; . /root/.bashrc \
-  ; easy_install dtale-1.7.8-py3.7.egg
+  ; easy_install dtale-1.7.9-py3.7.egg

docs/source/conf.py

@@ -64,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.7.8'
+version = u'1.7.9'
 # The full version, including alpha/beta/rc tags.
-release = u'1.7.8'
+release = u'1.7.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

dtale/app.py

@@ -104,7 +104,7 @@ def run(self, *args, **kwargs):
         :param args: Optional arguments to be passed to :meth:`flask:flask.run`
         :param kwargs: Optional keyword arguments to be passed to :meth:`flask:flask.run`
         """
-        self.port = str(kwargs.get('port'))
+        self.port = str(kwargs.get('port') or '')
         if kwargs.get('debug', False):
             self.reaper_on = False
         self.build_reaper()
@@ -445,27 +445,24 @@ def show(data=None, host=None, port=None, name=None, debug=False, subprocess=Tru
 
         ..link displayed in logging can be copied and pasted into any browser
     """
-    global ACTIVE_HOST, ACTIVE_PORT
+    global ACTIVE_HOST, ACTIVE_PORT, USE_NGROK
 
     try:
         logfile, log_level, verbose = map(kwargs.get, ['logfile', 'log_level', 'verbose'])
         setup_logging(logfile, log_level or 'info', verbose)
 
-        initialize_process_props(host, port, force)
         if USE_NGROK:
-            try:
-                from flask_ngrok import _run_ngrok
-            except ImportError:
-                raise ImportError((
-                    'In order to use this functionality please install flask-ngrok!\n'
-                    'You can try running "pip install dtale[ngrok]" if you are using pip.'
-                ))
+            if not PY3:
+                raise Exception('In order to use ngrok you must be using Python 3 or higher!')
+
+            from flask_ngrok import _run_ngrok
 
             ACTIVE_HOST = _run_ngrok()
             ACTIVE_PORT = None
-            url = ACTIVE_HOST
         else:
-            url = build_url(ACTIVE_PORT, ACTIVE_HOST)
+            initialize_process_props(host, port, force)
+
+        url = build_url(ACTIVE_PORT, ACTIVE_HOST)
         instance = startup(url, data=data, data_loader=data_loader, name=name, context_vars=context_vars,
                            ignore_duplicate=ignore_duplicate)
         is_active = not running_with_flask_debug() and is_up(url)
@@ -474,9 +471,14 @@ def _start():
                 if open_browser:
                     instance.open_browser()
         else:
+            if USE_NGROK:
+                thread = Timer(1, _run_ngrok)
+                thread.setDaemon(True)
+                thread.start()
+
             def _start():
                 app = build_app(url, reaper_on=reaper_on, host=ACTIVE_HOST)
-                if debug:
+                if debug and not USE_NGROK:
                     app.jinja_env.auto_reload = True
                     app.config['TEMPLATES_AUTO_RELOAD'] = True
                 else:
@@ -491,15 +493,6 @@ def _start():
                     cli.show_server_banner = lambda *x: None
 
                 if USE_NGROK:
-                    try:
-                        from flask_ngrok import run_with_ngrok
-                    except ImportError:
-                        raise ImportError((
-                            'In order to use this functionality please install flask-ngrok!\n'
-                            'You can try running "pip install dtale[ngrok]" if you are using pip.'
-                        ))
-
-                    run_with_ngrok(app)
                     app.run(threaded=True)
                 else:
                     app.run(host='0.0.0.0', port=ACTIVE_PORT, debug=debug, threaded=True)

dtale/static/css/main.css

@@ -8638,7 +8638,7 @@ caption {
 .column-toggle__dropdown::before {
   position: absolute;
   bottom: 100%;
-  left: 0.6em;
+  /*left: 0.6em;*/
   content: ' ';
   z-index: 2;
   width: 0;
@@ -8649,15 +8649,10 @@ caption {
   border-left: 0.5em solid transparent;
 }
 
-.column-toggle__dropdown.right::before {
-  left: auto;
-  right: 1.6em;
-}
-
 .column-toggle__dropdown::after {
   position: absolute;
   bottom: calc(100% - .1em);
-  left: 0.6em;
+  /*left: 0.6em;*/
   content: ' ';
   z-index: 2;
   width: 0;
@@ -8668,11 +8663,6 @@ caption {
   border-left: 0.5em solid transparent;
 }
 
-.column-toggle__dropdown.right::after {
-  left: auto;
-  right: 1.6em;
-}
-
 .column-toggle__dropdown header {
   border-bottom: solid 1px #a7b3b7;
   padding: .3em .5em;

dtale/utils.py

@@ -75,9 +75,10 @@ def build_url(port, host):
     :type host: str, optional
     :return: str
     """
+    final_port = ':{}'.format(port) if port is not None else ''
     if (host or '').startswith('http'):
-        return '{}{}'.format(host, ':{}'.format(port) if port is not None else '')
-    return 'http://{}:{}'.format(host, port)
+        return '{}{}'.format(host, final_port)
+    return 'http://{}{}'.format(host, final_port)
 
 
 def build_shutdown_url(base):

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtale",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "Visualizer for Pandas Data Structures",
   "main": "main.js",
   "directories": {

setup.py

@@ -50,7 +50,7 @@ def run_tests(self):
 
 setup(
     name="dtale",
-    version="1.7.8",
+    version="1.7.9",
     author="MAN Alpha Technology",
     author_email="[email protected]",
     description="Web Client for Visualizing Pandas Objects",
@@ -65,6 +65,7 @@ def run_tests(self):
         "dash_daq",
         "Flask-Compress",
         "Flask",
+        "flask-ngrok; python_version > '3.0'",
         "future",
         "itsdangerous",
         "pandas",
@@ -77,8 +78,7 @@ def run_tests(self):
         'r': [
             "rpy2<=2.8.6; python_version < '3.0'",
             "rpy2; python_version > '3.0'",
-        ],
-        'ngrok': ["flask-ngrok; python_version > '3.0'"]
+        ]
     },
     tests_require=[
         "ipython",