From db14c18cf86a1defff95fcfaf265edd5c5b357ac Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Mon, 19 Aug 2019 08:57:54 -0500 Subject: [PATCH 1/6] Use notebook v5.7.8 from branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eee0ec5..ba37f69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -RUN pip install civis-jupyter-notebook==${CIVIS_JUPYTER_NOTEBOOK_VERSION} && \ +RUN pip install git+https://github.com/civisanalytics/civis-jupyter-notebook.git@CIVP-18964-upgrade-notebook-package && \ civis-jupyter-notebooks-install RUN pip install git+git://github.com/civisanalytics/civis-mpl-style.git@v0.1.0 && \ From 303f8b52efc798954b5b4e38b4cfd420e2893e69 Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Mon, 19 Aug 2019 08:57:54 -0500 Subject: [PATCH 2/6] Use notebook v5.7.8 from branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eee0ec5..0079664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -RUN pip install civis-jupyter-notebook==${CIVIS_JUPYTER_NOTEBOOK_VERSION} && \ +RUN pip install git+https://github.com/civisanalytics/civis-jupyter-notebook.git@CIVP-18964-upgrade-notebook-package && \ civis-jupyter-notebooks-install RUN pip install git+git://github.com/civisanalytics/civis-mpl-style.git@v0.1.0 && \ From 8716d96b3476d8db122c19863ded98b5cf1d3285 Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Wed, 28 Aug 2019 10:57:47 -0500 Subject: [PATCH 3/6] Update civis-jupyter-notebook version to 1.0.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0079664..23745dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV VERSION= \ VERSION_MICRO= \ TINI_VERSION=v0.16.1 \ DEFAULT_KERNEL=python3 \ - CIVIS_JUPYTER_NOTEBOOK_VERSION=1.0.0 + CIVIS_JUPYTER_NOTEBOOK_VERSION=1.0.1 RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \ apt-get install -y --no-install-recommends software-properties-common && \ @@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -RUN pip install git+https://github.com/civisanalytics/civis-jupyter-notebook.git@CIVP-18964-upgrade-notebook-package && \ +RUN pip install civis-jupyter-notebook==${CIVIS_JUPYTER_NOTEBOOK_VERSION} && \ civis-jupyter-notebooks-install RUN pip install git+git://github.com/civisanalytics/civis-mpl-style.git@v0.1.0 && \ From 854f7b52541a47a0b8131652ceeb1c0178aa814b Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Wed, 28 Aug 2019 11:01:26 -0500 Subject: [PATCH 4/6] Update changlog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5c0f0..8a08218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased +## [1.12.1] - 2019-08-28 +### Changed +- Update civis-jupyter-notebook version to v1.0.1 (#31) + ## [1.12.0] - 2019-05-10 ### Changed - Update civis-jupyter-notebook version to v1.0.0 (#31) From cdd1a7d70c333d7b9c935118d044558ae0689388 Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Wed, 28 Aug 2019 11:08:02 -0500 Subject: [PATCH 5/6] Update changelog with correct PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a08218..5227468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [1.12.1] - 2019-08-28 ### Changed -- Update civis-jupyter-notebook version to v1.0.1 (#31) +- Update civis-jupyter-notebook version to v1.0.1 (#38) ## [1.12.0] - 2019-05-10 ### Changed From 3123bbb799bc074b415203be1ab46a79a8ddf4e6 Mon Sep 17 00:00:00 2001 From: Ari Ehrmann Date: Tue, 3 Sep 2019 10:54:59 -0500 Subject: [PATCH 6/6] Update changelog release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5227468..8dcc0f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased -## [1.12.1] - 2019-08-28 +## [1.12.1] - 2019-09-03 ### Changed - Update civis-jupyter-notebook version to v1.0.1 (#38)