Apply autoformatting

Author: krinsman

.gitignore

@@ -23,4 +23,3 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
-

nbresuse/__init__.py

@@ -1,7 +1,11 @@
 import os
 
 from tornado import ioloop
-from traitlets import Bool, Float, Int, Union, default
+from traitlets import Bool
+from traitlets import default
+from traitlets import Float
+from traitlets import Int
+from traitlets import Union
 from traitlets.config import Configurable
 
 from nbresuse.prometheus import PrometheusHandler
@@ -17,21 +21,21 @@ def _jupyter_server_extension_paths():
     """
     Set up the server extension for collecting metrics
     """
-    return [{
-        'module': 'nbresuse',
-    }]
+    return [{"module": "nbresuse"}]
 
 
 def _jupyter_nbextension_paths():
     """
     Set up the notebook extension for displaying metrics
     """
-    return [{
-        "section": "notebook",
-        "dest": "nbresuse",
-        "src": "static",
-        "require": "nbresuse/main"
-    }]
+    return [
+        {
+            "section": "notebook",
+            "dest": "nbresuse",
+            "src": "static",
+            "require": "nbresuse/main",
+        }
+    ]
 
 
 class ResourceUseDisplay(Configurable):
@@ -49,7 +53,7 @@ class ResourceUseDisplay(Configurable):
         we will start warning the user when they use (128 - (128 * 0.1)) MB.
 
         Set to 0 to disable warning.
-        """
+        """,
     ).tag(config=True)
 
     mem_limit = Union(
@@ -62,18 +66,18 @@ class ResourceUseDisplay(Configurable):
 
         Defaults to reading from the `MEM_LIMIT` environment variable. If
         set to 0, the max memory available is displayed.
-        """
+        """,
     ).tag(config=True)
 
-    @default('mem_limit')
+    @default("mem_limit")
     def _mem_limit_default(self):
-        return int(os.environ.get('MEM_LIMIT', 0))
+        return int(os.environ.get("MEM_LIMIT", 0))
 
     track_cpu_percent = Bool(
         default_value=False,
         help="""
         Set to True in order to enable reporting of CPU usage statistics.
-        """
+        """,
     ).tag(config=True)
 
     cpu_warning_threshold = Float(
@@ -86,7 +90,7 @@ def _mem_limit_default(self):
         we will start warning the user when they use (150 - (150 * 0.1)) %.
 
         Set to 0 to disable warning.
-        """
+        """,
     ).tag(config=True)
 
     cpu_limit = Float(
@@ -98,19 +102,19 @@ def _mem_limit_default(self):
 
         Defaults to reading from the `CPU_LIMIT` environment variable. If
         set to 0, the total CPU count available is displayed.
-        """
+        """,
     ).tag(config=True)
 
-    @default('cpu_limit')
+    @default("cpu_limit")
     def _cpu_limit_default(self):
-        return float(os.environ.get('CPU_LIMIT', 0))
+        return float(os.environ.get("CPU_LIMIT", 0))
 
 
 def load_jupyter_server_extension(nbapp):
     """
     Called during notebook start
     """
     resuseconfig = ResourceUseDisplay(parent=nbapp)
-    nbapp.web_app.settings['nbresuse_display_config'] = resuseconfig
+    nbapp.web_app.settings["nbresuse_display_config"] = resuseconfig
     callback = ioloop.PeriodicCallback(PrometheusHandler(nbapp), 1000)
     callback.start()

nbresuse/etc/nbextension.json

@@ -3,4 +3,3 @@
      "nbresuse/main": true
   }
 }
-

nbresuse/etc/serverextension.json

@@ -5,4 +5,3 @@
     }
   }
 }
-

nbresuse/metrics.py

@@ -20,10 +20,7 @@ def memory_metrics() -> MemoryMetrics:
     rss = sum([p.memory_info().rss for p in all_processes])
     virtual_memory = psutil.virtual_memory()
 
-    return MemoryMetrics(
-        rss,
-        virtual_memory.total
-    )
+    return MemoryMetrics(rss, virtual_memory.total)
 
 
 def cpu_metrics() -> CPUMetrics:
@@ -39,9 +36,7 @@ def get_cpu_percent(p):
         # about dead processes having no CPU usage
         except BaseException:
             return 0
+
     cpu_percent = sum([get_cpu_percent(p) for p in all_processes])
 
-    return CPUMetrics(
-        cpu_count * 100.0,
-        cpu_percent
-    )
+    return CPUMetrics(cpu_count * 100.0, cpu_percent)

nbresuse/prometheus.py

@@ -2,43 +2,30 @@
 from prometheus_client import Gauge
 from tornado import gen
 
-from nbresuse.metrics import CPUMetrics, MemoryMetrics, cpu_metrics, memory_metrics
+from nbresuse.metrics import cpu_metrics
+from nbresuse.metrics import CPUMetrics
+from nbresuse.metrics import memory_metrics
+from nbresuse.metrics import MemoryMetrics
 
 try:
     # Traitlets >= 4.3.3
     from traitlets import Callable
 except ImportError:
     from .utils import Callable
 
-TOTAL_MEMORY_USAGE = Gauge(
-    'total_memory_usage',
-    'counter for total memory usage',
-    []
-)
+TOTAL_MEMORY_USAGE = Gauge("total_memory_usage", "counter for total memory usage", [])
 
-MAX_MEMORY_USAGE = Gauge(
-    'max_memory_usage',
-    'counter for max memory usage',
-    []
-)
+MAX_MEMORY_USAGE = Gauge("max_memory_usage", "counter for max memory usage", [])
 
-TOTAL_CPU_USAGE = Gauge(
-    'total_cpu_usage',
-    'counter for total cpu usage',
-    []
-)
+TOTAL_CPU_USAGE = Gauge("total_cpu_usage", "counter for total cpu usage", [])
 
-MAX_CPU_USAGE = Gauge(
-    'max_cpu_usage',
-    'counter for max cpu usage',
-    []
-)
+MAX_CPU_USAGE = Gauge("max_cpu_usage", "counter for max cpu usage", [])
 
 
 class PrometheusHandler(Callable):
     def __init__(self, nbapp: NotebookApp):
         super().__init__()
-        self.config = nbapp.web_app.settings['nbresuse_display_config']
+        self.config = nbapp.web_app.settings["nbresuse_display_config"]
         self.session_manager = nbapp.session_manager
 
     @gen.coroutine

nbresuse/tests/test_basic.py

@@ -1,38 +1,45 @@
-from mock import MagicMock, patch
+from mock import MagicMock
+from mock import patch
 
 
 class TestBasic:
-    '''Some basic tests, checking import, making sure APIs remain consistent, etc'''
+    """Some basic tests, checking import, making sure APIs remain consistent, etc"""
 
     def test_import_serverextension(self):
-        '''Check that serverextension hooks are available'''
-        from nbresuse import _jupyter_server_extension_paths, \
-            _jupyter_nbextension_paths, \
-            load_jupyter_server_extension
-
-        assert _jupyter_server_extension_paths() == [{'module': 'nbresuse'}]
-        assert _jupyter_nbextension_paths() == [{
-            "section": "notebook",
-            "dest": "nbresuse",
-            "src": "static",
-            "require": "nbresuse/main"
-        }]
+        """Check that serverextension hooks are available"""
+        from nbresuse import (
+            _jupyter_server_extension_paths,
+            _jupyter_nbextension_paths,
+            load_jupyter_server_extension,
+        )
+
+        assert _jupyter_server_extension_paths() == [{"module": "nbresuse"}]
+        assert _jupyter_nbextension_paths() == [
+            {
+                "section": "notebook",
+                "dest": "nbresuse",
+                "src": "static",
+                "require": "nbresuse/main",
+            }
+        ]
 
         # mock a notebook app
         nbapp_mock = MagicMock()
         nbapp_mock.web_app.settings = {}
 
         # mock these out for unit test
-        with patch('tornado.ioloop.PeriodicCallback') as periodic_callback_mock, \
-                patch('nbresuse.ResourceUseDisplay') as resource_use_display_mock, \
-                patch('nbresuse.PrometheusHandler') as prometheus_handler_mock:
+        with patch("tornado.ioloop.PeriodicCallback") as periodic_callback_mock, patch(
+            "nbresuse.ResourceUseDisplay"
+        ) as resource_use_display_mock, patch(
+            "nbresuse.PrometheusHandler"
+        ) as prometheus_handler_mock:
 
             # load up with mock
             load_jupyter_server_extension(nbapp_mock)
 
             # assert that we installed the application in settings
             print(nbapp_mock.web_app.settings)
-            assert 'nbresuse_display_config' in nbapp_mock.web_app.settings
+            assert "nbresuse_display_config" in nbapp_mock.web_app.settings
 
             # assert that we instantiated a periodic callback with the fake
             # prometheus

nbresuse/utils.py

@@ -1,5 +1,5 @@
-from traitlets import TraitType
 import six
+from traitlets import TraitType
 
 # copy-pasted from the master of Traitlets source
 
@@ -11,7 +11,7 @@ class Callable(TraitType):
     Classes are callable, as are instances
     with a __call__() method."""
 
-    info_text = 'a callable'
+    info_text = "a callable"
 
     def validate(self, obj, value):
         if six.callable(value):

setup.py

@@ -1,6 +1,7 @@
+import pathlib
 from glob import glob
+
 import setuptools
-import pathlib
 
 # The directory containing this file
 HERE = pathlib.Path(__file__).parent
@@ -10,7 +11,7 @@
 
 setuptools.setup(
     name="nbresuse",
-    version='0.3.3',
+    version="0.3.3",
     url="https://github.com/yuvipanda/nbresuse",
     author="Yuvi Panda",
     description="Simple Jupyter extension to show how much resources (RAM) your notebook is using",
@@ -20,24 +21,20 @@
     classifiers=[
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3",
-        ],
-    packages=setuptools.find_packages(),
-    install_requires=[
-        'psutil>=5.6.0',
-        'notebook>=5.6.0',
     ],
+    packages=setuptools.find_packages(),
+    install_requires=["psutil>=5.6.0", "notebook>=5.6.0"],
     extras_require={
-        'dev': ['autopep8',
-                'pytest',
-                'flake8',
-                'pytest-cov>=2.6.1',
-                'mock']
+        "dev": ["autopep8", "pytest", "flake8", "pytest-cov>=2.6.1", "mock"]
     },
     data_files=[
-        ('share/jupyter/nbextensions/nbresuse', glob('nbresuse/static/*')),
-        ('etc/jupyter/jupyter_notebook_config.d', ['nbresuse/etc/serverextension.json']),
-        ('etc/jupyter/nbconfig/notebook.d', ['nbresuse/etc/nbextension.json'])
+        ("share/jupyter/nbextensions/nbresuse", glob("nbresuse/static/*")),
+        (
+            "etc/jupyter/jupyter_notebook_config.d",
+            ["nbresuse/etc/serverextension.json"],
+        ),
+        ("etc/jupyter/nbconfig/notebook.d", ["nbresuse/etc/nbextension.json"]),
     ],
     zip_safe=False,
-    include_package_data=True
+    include_package_data=True,
 )