Merge branch 'develop' into componentize

requirements/dev.in

@@ -4,11 +4,14 @@ colorlog
 jip
 jupyter
 lxml
+notebook >= 5.7.8
 pip-tools >= 2.0.2
 pyside
 qtconsole
+requests >= 2.20.0
 restview
 tox >= 3.7.0
+urllib3 >= 1.24.2
 wheel
 zc.buildout >= 2.13.1
 zest.releaser

requirements/dev.txt

@@ -37,17 +37,17 @@ future==0.16.0            # via commonmark
 html5lib==0.999999999     # via bleach
 idna==2.6                 # via requests
 imagesize==0.7.1          # via sphinx
-ipaddress==1.0.22         # via cryptography
+ipaddress==1.0.22         # via cryptography, notebook
 ipykernel==4.6.1          # via ipywidgets, jupyter, jupyter-console, notebook, qtconsole
 ipython-genutils==0.2.0   # via nbformat, notebook, qtconsole, traitlets
 ipython==5.4.1            # via ipykernel, ipywidgets, jupyter-console
 ipywidgets==7.0.0         # via jupyter
-jinja2==2.9.6             # via nbconvert, notebook, sphinx
+jinja2==2.10.3
 jip==0.9.13
 jsonschema==2.6.0         # via nbformat
-jupyter-client==5.1.0     # via ipykernel, jupyter-console, notebook, qtconsole
+jupyter-client==5.3.4     # via ipykernel, jupyter-console, notebook, qtconsole
 jupyter-console==5.2.0    # via jupyter
-jupyter-core==4.3.0       # via jupyter-client, nbconvert, nbformat, notebook, qtconsole
+jupyter-core==4.6.1       # via jupyter-client, nbconvert, nbformat, notebook, qtconsole
 jupyter==1.0.0
 lxml==3.8.0 ; platform_python_implementation != "Jython"
 markupsafe==1.0           # via jinja2
@@ -56,7 +56,7 @@ mistune==0.7.4            # via nbconvert
 more-itertools==5.0.0     # via pytest
 nbconvert==5.3.1          # via jupyter, notebook
 nbformat==4.4.0           # via ipywidgets, nbconvert, notebook
-notebook==5.0.0           # via jupyter, widgetsnbextension
+notebook==5.7.8
 olefile==0.44 ; platform_python_implementation != "Jython"
 pandocfilters==1.4.2      # via nbconvert
 pathlib2==2.3.0           # via ipython, pickleshare, pytest
@@ -65,6 +65,7 @@ pickleshare==0.7.4        # via ipython
 pip-tools==2.0.2
 pkginfo==1.4.1            # via twine
 pluggy==0.9.0             # via pytest, tox
+prometheus-client==0.7.1  # via notebook
 prompt-toolkit==1.0.15    # via ipython, jupyter-console
 ptyprocess==0.5.2         # via pexpect, terminado
 py==1.8.0                 # via pytest, tox
@@ -77,14 +78,15 @@ pyside==1.2.4
 pytest==4.3.1
 python-dateutil==2.6.1    # via jupyter-client
 pytz==2017.2              # via babel
-pyzmq==16.0.2             # via jupyter-client
+pyzmq==18.1.1             # via jupyter-client, notebook
 qtconsole==4.3.1
 readme-renderer==17.2     # via restview
 repoze.sphinx.autointerface==0.8
 requests-toolbelt==0.8.0  # via twine
-requests==2.18.4          # via jip, requests-toolbelt, sphinx, twine
+requests==2.22.0
 restview==2.7.0
 scandir==1.5              # via pathlib2
+send2trash==1.5.0         # via notebook
 simplegeneric==0.8.1      # via ipython
 singledispatch==3.4.0.3   # via tornado
 six==1.11.0               # via bleach, cryptography, html5lib, more-itertools, pathlib2, pip-tools, prompt-toolkit, pytest, python-dateutil, readme-renderer, singledispatch, sphinx, sphinx-intl, tox, traitlets, zest.releaser
@@ -93,16 +95,16 @@ sphinx-argparse==0.2.1
 sphinx-intl==0.9.9
 sphinx==1.6.3
 sphinxcontrib-websupport==1.0.1  # via sphinx
-terminado==0.6            # via notebook
+terminado==0.8.3          # via notebook
 testpath==0.3.1           # via nbconvert
 toml==0.10.0              # via tox
-tornado==4.5.2            # via ipykernel, notebook, terminado
+tornado==4.5.2            # via ipykernel, jupyter-client, notebook, terminado
 tox==3.7.0
 tqdm==4.15.0              # via twine
 traitlets==4.3.2          # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook, qtconsole
 twine==1.9.1              # via zest.releaser
 typing==3.6.2             # via sphinx
-urllib3==1.22             # via requests
+urllib3==1.25.7
 virtualenv==15.1.0        # via tox
 wcwidth==0.1.7            # via prompt-toolkit
 webencodings==0.5.1       # via html5lib

requirements/docs.in

@@ -1,4 +1,5 @@
 alabaster >= 0.7.10
+jinja2 >= 2.10.1
 repoze.sphinx.autointerface
 sphinx >= 1.5
 sphinx-argparse

requirements/docs.txt

@@ -12,7 +12,7 @@ click==7.0                # via sphinx-intl
 docutils==0.14            # via sphinx
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
-jinja2==2.10              # via sphinx
+jinja2==2.10.3
 markupsafe==1.1.1         # via jinja2
 packaging==19.0           # via sphinx
 pygments==2.3.1           # via sphinx