From a5bf462c04fcc2dc95e4b72f7cc36f4c389aee38 Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Mon, 6 Jan 2020 14:27:07 -0500 Subject: [PATCH 01/16] set renderer --- Examples.ipynb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Examples.ipynb b/Examples.ipynb index 72967cf..22d9251 100644 --- a/Examples.ipynb +++ b/Examples.ipynb @@ -48,7 +48,9 @@ "\n", "templated_fig = pio.to_templated(fig)\n", "pio.templates['my_template'] = templated_fig.layout.template\n", - "pio.templates.default = 'my_template'" + "pio.templates.default = 'my_template'\n", + "\n", + "alt.renderers.enable('png')" ] }, { @@ -354,7 +356,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "(\n", " alt.Chart(\n", " mpg, title=\"Number of Cars by Make\"\n", From 1a2e7f5d9881a74580d346e6788be1f8c5f17ee3 Mon Sep 17 00:00:00 2001 From: Timothy Hopper Date: Mon, 6 Jan 2020 18:23:15 -0500 Subject: [PATCH 02/16] set webdriver --- Examples.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples.ipynb b/Examples.ipynb index 22d9251..add16c4 100644 --- a/Examples.ipynb +++ b/Examples.ipynb @@ -50,7 +50,7 @@ "pio.templates['my_template'] = templated_fig.layout.template\n", "pio.templates.default = 'my_template'\n", "\n", - "alt.renderers.enable('png')" + "alt.renderers.enable('png', webdriver='firefox')" ] }, { From 7893641bab6c60512b00cf8240998c908a530f51 Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Tue, 7 Jan 2020 10:27:58 -0500 Subject: [PATCH 03/16] remove altair magic --- Examples.ipynb | 56 -------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/Examples.ipynb b/Examples.ipynb index add16c4..d70a77f 100644 --- a/Examples.ipynb +++ b/Examples.ipynb @@ -53,44 +53,6 @@ "alt.renderers.enable('png', webdriver='firefox')" ] }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "from io import BytesIO\n", - "\n", - "def render_altair(chart):\n", - " b = BytesIO()\n", - " chart.save(b, scale_factor=2.0, format='png', webdriver='firefox')\n", - " b.seek(0)\n", - " return b.read()\n", - "\n", - "\n", - "import ast\n", - "\n", - "def exec_then_eval(code, shell):\n", - " block = ast.parse(code, mode='exec')\n", - "\n", - " # assumes last node is an expression\n", - " last = ast.Expression(block.body.pop().value)\n", - "\n", - " _globals, _locals = {}, {}\n", - " shell.ex(compile(block, '', mode='exec'))\n", - " return shell.ev(compile(last, '', mode='eval'))\n", - "\n", - "@magics_class\n", - "class AltairMagic(Magics):\n", - " @cell_magic\n", - " def altair(self, line, cell):\n", - " return Image(render_altair(exec_then_eval(cell, self.shell)))\n", - "\n", - "\n", - "ip = get_ipython()\n", - "ip.register_magics(AltairMagic)" - ] - }, { "cell_type": "code", "execution_count": null, @@ -111,13 +73,6 @@ "theme_set(theme_grey(base_size = 24))" ] }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, { "cell_type": "markdown", "metadata": {}, @@ -476,7 +431,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "(\n", " alt.Chart(mpg)\n", " .mark_bar()\n", @@ -567,7 +521,6 @@ }, "outputs": [], "source": [ - "%%altair \n", "alt.Chart(mpg).mark_circle().encode(\n", " alt.X(\n", " \"displ\",\n", @@ -814,7 +767,6 @@ }, "outputs": [], "source": [ - "%%altair \n", "(\n", " alt.Chart(\n", " mpg,\n", @@ -949,7 +901,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "(\n", " alt.Chart(\n", " mpg,\n", @@ -1069,7 +1020,6 @@ }, "outputs": [], "source": [ - "%%altair \n", "alt.Chart(mpg).mark_circle().encode(\n", " x=alt.X(\"displ\"),\n", " y=alt.Y(\"hwy\"),\n", @@ -1191,7 +1141,6 @@ }, "outputs": [], "source": [ - "%%altair \n", "(alt\n", " .Chart(mpg)\n", " .mark_circle()\n", @@ -1307,7 +1256,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "scatter = (\n", " alt.Chart(\n", " mpg,\n", @@ -1464,7 +1412,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "alt.data_transformers.disable_max_rows()\n", "alt.Chart(diamonds).mark_bar().encode(\n", " x=\"cut\", y=\"count(cut)\", color=\"clarity\"\n", @@ -1553,7 +1500,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "alt.data_transformers.disable_max_rows()\n", "alt.Chart(diamonds).mark_bar().encode(\n", " x=\"clarity\",\n", @@ -1728,7 +1674,6 @@ }, "outputs": [], "source": [ - "%%altair\n", "alt.data_transformers.disable_max_rows()\n", "alt.Chart(diamonds).transform_density(\n", " \"depth\",\n", @@ -1850,7 +1795,6 @@ }, "outputs": [], "source": [ - "%%altair \n", "alt.Chart(ts).mark_line().encode(\n", " x=\"date\", y=\"value\"\n", ")" From 1407a815d8a0eee3eac18b27d1eaefd98cf4f4c2 Mon Sep 17 00:00:00 2001 From: Timothy Hopper Date: Tue, 14 Apr 2020 12:48:15 -0400 Subject: [PATCH 04/16] install altair_saver --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 44159dd..71f1571 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,4 +19,5 @@ plotly tzlocal simplegeneric altair +altair_saver selenium From ffd47bc570573a2d2a66d7d2564ae7438660f392 Mon Sep 17 00:00:00 2001 From: Timothy Hopper Date: Tue, 14 Apr 2020 12:49:23 -0400 Subject: [PATCH 05/16] fix name --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 71f1571..9fc0c35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ plotly tzlocal simplegeneric altair -altair_saver +altair-saver selenium From 7324a8beb03656359fa8f6fe82f687d032abdef9 Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Sat, 13 Jun 2020 12:27:38 -0400 Subject: [PATCH 06/16] remove mail chimp for now --- templates/t_index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/t_index.html b/templates/t_index.html index 01df5d6..adaf73d 100644 --- a/templates/t_index.html +++ b/templates/t_index.html @@ -190,6 +190,5 @@
Note:
}); $.bigfoot(); - From 63240e2f55500517ef89db23cf4cfcc80668658e Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Sat, 13 Jun 2020 14:36:39 -0400 Subject: [PATCH 07/16] upgrade statsmodels --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9fc0c35..180d28e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ scikit-misc boto3 pytest chart-studio -statsmodels==0.10.0rc2 --pre +statsmodels==0.11.1 rpy2 psutil plotly From 3cfe6e5f776b82279a23ab8e2ccaf48264a2ca83 Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Sat, 13 Jun 2020 14:45:03 -0400 Subject: [PATCH 08/16] pin plotnine at <0.7 started getting a MemoryError running (ggplot(diamonds) + aes('depth', fill='cut', color='cut') + geom_density(alpha=0.1)) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 180d28e..a0aaeb2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ ipython pandas jupyter seaborn -plotnine +plotnine<0.7.0 jinja2 jinja2-highlight markdown From 41aca4c2481d8c44b4f2e3e0a9d5f932d1a1933d Mon Sep 17 00:00:00 2001 From: Tim Hopper Date: Sat, 13 Jun 2020 15:11:42 -0400 Subject: [PATCH 09/16] Use bootstrap from cdn --- templates/t_index.html | 18 +- web/css/bootstrap-grid.css | 1339 ---- web/css/bootstrap-grid.css.map | 1 - web/css/bootstrap-grid.min.css | 1 - web/css/bootstrap-grid.min.css.map | 1 - web/css/bootstrap-reboot.css | 459 -- web/css/bootstrap-reboot.css.map | 1 - web/css/bootstrap-reboot.min.css | 1 - web/css/bootstrap-reboot.min.css.map | 1 - web/css/bootstrap.css | 9320 -------------------------- web/css/bootstrap.css.map | 1 - web/css/bootstrap.min.css | 6 - web/css/bootstrap.min.css.map | 1 - web/css/custom.css | 35 - web/css/pygments-github.css | 61 - web/css/pygments-murphy.css | 63 - web/css/pygments-native.css | 72 - web/js/bootstrap.js | 3535 ---------- web/js/bootstrap.min.js | 7 - 19 files changed, 5 insertions(+), 14918 deletions(-) delete mode 100644 web/css/bootstrap-grid.css delete mode 100644 web/css/bootstrap-grid.css.map delete mode 100644 web/css/bootstrap-grid.min.css delete mode 100644 web/css/bootstrap-grid.min.css.map delete mode 100644 web/css/bootstrap-reboot.css delete mode 100644 web/css/bootstrap-reboot.css.map delete mode 100644 web/css/bootstrap-reboot.min.css delete mode 100644 web/css/bootstrap-reboot.min.css.map delete mode 100644 web/css/bootstrap.css delete mode 100644 web/css/bootstrap.css.map delete mode 100644 web/css/bootstrap.min.css delete mode 100644 web/css/bootstrap.min.css.map delete mode 100644 web/css/custom.css delete mode 100644 web/css/pygments-github.css delete mode 100644 web/css/pygments-murphy.css delete mode 100644 web/css/pygments-native.css delete mode 100644 web/js/bootstrap.js delete mode 100644 web/js/bootstrap.min.js diff --git a/templates/t_index.html b/templates/t_index.html index adaf73d..6b6443e 100644 --- a/templates/t_index.html +++ b/templates/t_index.html @@ -33,12 +33,8 @@ - - - + - - @@ -174,15 +170,11 @@
Note:
- - - - + + + + - - +