Merge branch 'release/v0.3.7'

CHANGES.rst

@@ -2,6 +2,11 @@
 Release notes
 =============
 
+Version 0.3.7, July 2020
+------------------------
+* Using ``ING``'s matplotlib style for the report plots (orange plots).
+* Add ``popmon`` installation command at the beginning of example notebooks (seamless running).
+
 Version 0.3.6, July 2020
 ------------------------
 * Extending make.bat and Makefile to support ``make install`` (on all platforms).

docs/source/readme.rst

@@ -4,7 +4,7 @@ Population Shift Monitoring
 
 |build| |docs|
 
-* Version: 0.3.6. Released: July 2020
+* Version: 0.3.7. Released: July 2020
 * Documentation: https://popmon.readthedocs.io
 * Repository: https://github.com/ing-bank/popmon
 * Authors: ING Wholesale Banking Advanced Analytics

popmon/notebooks/popmon_tutorial_advanced.ipynb

@@ -14,18 +14,32 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "outputs": [],
-   "source": [
-    "from IPython.core.display import display, HTML\n",
-    "display(HTML(\"<style>.container { width:80% !important; }</style>\"))\n",
-    "display(HTML(\"<style>div.output_scroll { height: 44em; }</style>\"))"
-   ],
    "metadata": {
     "collapsed": false,
+    "jupyter": {
+     "outputs_hidden": false
+    },
     "pycharm": {
      "name": "#%%\n"
     }
-   }
+   },
+   "outputs": [],
+   "source": [
+    "from IPython.core.display import display, HTML\n",
+    "display(HTML(\"<style>.container { width:80% !important; }</style>\"))\n",
+    "display(HTML(\"<style>div.output_scroll { height: 44em; }</style>\"))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# install popmon (if not installed yet)\n",
+    "import sys\n",
+    "!{sys.executable} -m pip install popmon"
+   ]
   },
   {
    "cell_type": "code",
@@ -400,21 +414,21 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.7"
   },
   "nteract": {
    "version": "0.15.0"
   },
   "pycharm": {
    "stem_cell": {
     "cell_type": "raw",
-    "source": [],
     "metadata": {
      "collapsed": false
-    }
+    },
+    "source": []
    }
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

popmon/notebooks/popmon_tutorial_basic.ipynb

@@ -14,6 +14,15 @@
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {
+    "collapsed": false,
+    "jupyter": {
+     "outputs_hidden": false
+    },
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
    "outputs": [],
    "source": [
     "# (optional) Adjust the jupyter notebook style for easier navigation of the reports\n",
@@ -22,13 +31,7 @@
     "display(HTML(\"<style>.container { width:80% !important; }</style>\"))\n",
     "# Cells are higher by default\n",
     "display(HTML(\"<style>div.output_scroll { height: 44em; }</style>\"))"
-   ],
-   "metadata": {
-    "collapsed": false,
-    "pycharm": {
-     "name": "#%%\n"
-    }
-   }
+   ]
   },
   {
    "cell_type": "markdown",
@@ -40,9 +43,18 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# install popmon (if not installed yet)\n",
+    "import sys\n",
+    "!{sys.executable} -m pip install popmon"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "import pandas as pd\n",
@@ -93,9 +105,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# generate report based on histograms\n",
@@ -177,18 +187,18 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.7"
   },
   "pycharm": {
    "stem_cell": {
     "cell_type": "raw",
-    "source": [],
     "metadata": {
      "collapsed": false
-    }
+    },
+    "source": []
    }
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
-}
+ "nbformat_minor": 4
+}

popmon/notebooks/popmon_tutorial_incremental_data.ipynb

@@ -36,9 +36,18 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# install popmon (if not installed yet)\n",
+    "import sys\n",
+    "!{sys.executable} -m pip install popmon"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
    "outputs": [],
    "source": [
     "import pandas as pd\n",
@@ -432,18 +441,18 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.7"
   },
   "pycharm": {
    "stem_cell": {
     "cell_type": "raw",
-    "source": [],
     "metadata": {
      "collapsed": false
-    }
+    },
+    "source": []
    }
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
-}
+ "nbformat_minor": 4
+}

popmon/version.py

@@ -1,6 +1,6 @@
 """THIS FILE IS AUTO-GENERATED BY SETUP.PY."""
 
 name = "popmon"
-version = "0.3.6"
-full_version = "0.3.6"
+version = "0.3.7"
+full_version = "0.3.7"
 release = True

popmon/visualization/utils.py

@@ -26,10 +26,12 @@
 import numpy as np
 import pandas as pd
 import pybase64
+from ing_theme_matplotlib import mpl_style
 
 NUM_NS_DAY = 24 * 3600 * int(1e9)
 
 logger = logging.getLogger()
+mpl_style(dark=False)
 
 
 def plt_to_base64():
@@ -76,7 +78,7 @@ def plot_bars_b64(data, labels=None, bounds=None, ylim=False, skip_empty=True):
 
     index = np.arange(n)
     width = (index[1] - index[0]) * 0.9 if n >= 2 else 1.0
-    ax.bar(index, data, width=width, align="center", alpha=0.5)
+    ax.bar(index, data, width=width, align="center")
 
     if labels:
         ax.set_xticks(index)

requirements-test.txt

@@ -5,4 +5,4 @@ nbconvert>=5.3.1
 jupyter_client>=5.2.3
 ipykernel>=5.1.3
 black>=19.10b0
-isort>=4.3.21
+isort==4.3.21

requirements.txt

@@ -9,3 +9,4 @@ matplotlib>=2.2.3
 joblib>=0.14.0
 pybase64>=1.0.1
 htmlmin
+ing_theme_matplotlib

setup.py

@@ -4,7 +4,7 @@
 
 MAJOR = 0
 REVISION = 3
-PATCH = 6
+PATCH = 7
 DEV = False
 # NOTE: also update version at: README.rst