From 5c6cc597c8b1080ae7a64b91fc6111f6db56b1e1 Mon Sep 17 00:00:00 2001
From: Charlotte Weaver <charlottesweaver@gmail.com>
Date: Wed, 5 Dec 2018 13:38:34 -0800
Subject: [PATCH] Default warning in debug mode (#497)

---
 server/app/app.py    |  5 +----
 server/cli/launch.py | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/app/app.py b/server/app/app.py
index a2323d70..1327aa4b 100644
--- a/server/app/app.py
+++ b/server/app/app.py
@@ -1,5 +1,4 @@
 import os
-import warnings
 
 from flask import Flask
 from flask_caching import Cache
@@ -8,13 +7,11 @@ from flask_cors import CORS
 from flask_restful_swagger_2 import get_swagger_blueprint
 
 from .rest_api.rest import get_api_resources
-from .util.utils import Float32JSONEncoder, custom_format_warning
+from .util.utils import Float32JSONEncoder
 from .web import webapp
 
 REACTIVE_LIMIT = 1_000_000
 
-warnings.formatwarning = custom_format_warning
-
 app = Flask(__name__, static_folder="web/static")
 app.json_encoder = Float32JSONEncoder
 cache = Cache(app, config={"CACHE_TYPE": "simple", "CACHE_DEFAULT_TIMEOUT": 860000})
diff --git a/server/cli/launch.py b/server/cli/launch.py
index 25a11f99..cb3dce2e 100644
--- a/server/cli/launch.py
+++ b/server/cli/launch.py
@@ -1,11 +1,14 @@
-import sys
-import click
 import logging
 from os import devnull
 from os.path import splitext, basename
+import sys
+import warnings
 import webbrowser
 
+import click
+
 from server.app.util.errors import ScanpyFileError
+from server.app.util.utils import custom_format_warning
 
 
 @click.command()
@@ -48,9 +51,6 @@ def launch(data, layout, diffexp, title, verbose, debug, obs_names, var_names,
     # Startup message
     click.echo("[cellxgene] Starting the CLI...")
 
-    # Import Flask app
-    from server.app.app import app
-
     # Argument checking
     name, extension = splitext(data)
     if extension != ".h5ad":
@@ -59,6 +59,8 @@ def launch(data, layout, diffexp, title, verbose, debug, obs_names, var_names,
     if debug:
         verbose = True
         open_browser = False
+    else:
+        warnings.formatwarning = custom_format_warning
 
     if not verbose:
         sys.tracebacklimit = 0
@@ -71,6 +73,9 @@ def launch(data, layout, diffexp, title, verbose, debug, obs_names, var_names,
     cellxgene_url = f"http://{host}:{port}"
     api_base = f"{cellxgene_url}/api/"
 
+    # Import Flask app
+    from server.app.app import app
+
     app.config.update(
         DATASET_TITLE=title,
         CXG_API_BASE=api_base