Skip to content

Commit

Permalink
Merge branch 'remove_terminado_pinning' into test_notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
BjoernLudwigPTB committed Apr 29, 2021
2 parents 390e962 + dacd5f1 commit 48ef046
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
2 changes: 1 addition & 1 deletion requirements/requirements-dev.txt
Expand Up @@ -313,7 +313,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.4
# via sphinx
terminado==0.8.3
terminado==0.9.4
# via
# -c requirements/requirements.txt
# notebook
Expand Down
8 changes: 0 additions & 8 deletions requirements/requirements.in
Expand Up @@ -7,11 +7,3 @@ numpy
pandas
plotly
PyDynamic
# This was needed from 3e072fd on, because of the following error in the cached
# mybinder.org image while installing dependencies:
# Attempting uninstall: terminado
# Found existing installation: terminado 0.8.3
# ERROR: Cannot uninstall 'terminado'. It is a distutils installed project and thus we
# cannot accurately determine which files belong to it which would lead to only a
# partial uninstall.
terminado == 0.8.3
6 changes: 2 additions & 4 deletions requirements/requirements.txt
Expand Up @@ -218,10 +218,8 @@ six==1.15.0
# plotly
# python-dateutil
# retrying
terminado==0.8.3
# via
# -r requirements/requirements.in
# notebook
terminado==0.9.4
# via notebook
testpath==0.4.4
# via nbconvert
tornado==6.1
Expand Down

0 comments on commit 48ef046

Please sign in to comment.