Merge branch 'master' into development

NREL · Nov 21, 2020 · a4987a1 · a4987a1
2 parents da05d1c + 863e8bb
commit a4987a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/docs/notebook_requirements.txt b/docs/notebook_requirements.txt
@@ -21,7 +21,7 @@ MarkupSafe==1.1.1
 mistune==0.8.3
 nbconvert==5.3.1
 nbformat==5.0.7
-notebook==5.7.8
+notebook==6.1.5
 pandocfilters==1.4.2
 parso==0.3.1
 pexpect==4.6.0
@@ -34,7 +34,8 @@ pyzmq==17.1.0
 qtconsole==4.3.1
 Send2Trash==1.5.0
 simplegeneric==0.8.1
-terminado==0.8.1
+tables==3.6.1
+terminado==0.8.3
 testpath==0.3.1
 tornado==5.1
 traitlets==4.3.2

diff --git a/docs/sphinx/source/changelog.rst b/docs/sphinx/source/changelog.rst
@@ -2,6 +2,7 @@ RdTools Change Log
 ==================
 
 .. include:: changelog/v2.1.0-beta.0.rst
+.. include:: changelog/v2.0.3.rst
 .. include:: changelog/v2.0.2.rst
 .. include:: changelog/v2.0.1.rst
 .. include:: changelog/v2.0.0.rst

diff --git a/docs/sphinx/source/changelog/v2.0.3.rst b/docs/sphinx/source/changelog/v2.0.3.rst
@@ -0,0 +1,13 @@
+**************************
+v2.0.3 (November 20, 2020)
+**************************
+
+Requirements
+------------
+* Change to ``docs/notebook_requirements.txt``: notebook version from 5.7.8 to
+  6.1.5 and terminado version from 0.8.1 to 0.8.3 (:pull:`239`)
+
+Contributors
+------------
+* Mike Deceglie (:ghuser:`mdeceglie`)
+* :ghuser:`dependabot`