From b39634af4953c4df0f07720f825e92bd1521d900 Mon Sep 17 00:00:00 2001 From: Paul Butler Date: Wed, 7 Feb 2024 13:35:24 -0500 Subject: [PATCH] Changes for Plane2 --- Dockerfile | 4 +- freeze.sh | 2 +- freeze.txt | 159 +++++++++++++++++++++++------------------------ requirements.txt | 2 +- 4 files changed, 84 insertions(+), 83 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed6be42..da167d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM python:3.11.3-slim # This entire section is only needed while we are using notebook directly from git instead of pypi. # If it were permanent, we would want to do a multi-stage built, but it's not. RUN apt-get update +RUN apt-get install -y build-essential RUN apt-get install -y git RUN apt-get install -y curl RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - @@ -35,5 +36,6 @@ CMD /home/jupyter/notebook-env/bin/jupyter \ --ip 0.0.0.0 \ --port $PORT \ --no-browser \ - --NotebookApp.token="" \ + --ServerApp.token="" \ + --ServerApp.base_url="${SESSION_BACKEND_STATIC_TOKEN}" \ --JupyterNotebookApp.default_url="/notebooks/hello-jamsocket.ipynb" diff --git a/freeze.sh b/freeze.sh index 2a6497a..d52d562 100755 --- a/freeze.sh +++ b/freeze.sh @@ -2,7 +2,7 @@ set -e -virtualenv env +python3 -m virtualenv env . env/bin/activate pip install -r requirements.txt pip freeze > freeze.txt diff --git a/freeze.txt b/freeze.txt index b53a5e0..f5bb4d6 100644 --- a/freeze.txt +++ b/freeze.txt @@ -1,103 +1,102 @@ -anyio==3.7.0 -argon2-cffi==21.3.0 +anyio==4.2.0 +appnope==0.1.4 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 -asttokens==2.2.1 -async-lru==2.0.2 -attrs==23.1.0 -Babel==2.12.1 -backcall==0.2.0 -beautifulsoup4==4.12.2 -bleach==6.0.0 -certifi==2023.5.7 -cffi==1.15.1 -charset-normalizer==3.1.0 -comm==0.1.3 -contourpy==1.0.7 -cycler==0.11.0 -debugpy==1.6.7 +arrow==1.3.0 +asttokens==2.4.1 +async-lru==2.0.4 +attrs==23.2.0 +Babel==2.14.0 +beautifulsoup4==4.12.3 +bleach==6.1.0 +certifi==2024.2.2 +cffi==1.16.0 +charset-normalizer==3.3.2 +comm==0.2.1 +contourpy==1.2.0 +cycler==0.12.1 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -exceptiongroup==1.1.1 -executing==1.2.0 -fastjsonschema==2.17.1 -fonttools==4.39.4 +executing==2.0.1 +fastjsonschema==2.19.1 +fonttools==4.48.1 fqdn==1.5.1 -idna==3.4 -importlib-metadata==6.6.0 -importlib-resources==5.12.0 -ipykernel==6.23.1 -ipython==8.14.0 +h11==0.14.0 +httpcore==1.0.2 +httpx==0.26.0 +idna==3.6 +ipykernel==6.29.2 +ipython==8.21.0 isoduration==20.11.0 -jedi==0.18.2 -Jinja2==3.1.2 +jedi==0.19.1 +Jinja2==3.1.3 json5==0.9.14 -jsonpointer==2.3 -jsonschema==4.17.3 -jupyter-events==0.6.3 -jupyter-lsp==2.2.0 -jupyter_client==8.2.0 -jupyter_core==5.3.0 -jupyter_server==2.6.0 -jupyter_server_terminals==0.4.4 -jupyterlab==4.0.2 -jupyterlab-pygments==0.2.2 -jupyterlab_server==2.22.1 -kiwisolver==1.4.4 -MarkupSafe==2.1.3 -matplotlib==3.7.1 +jsonpointer==2.4 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 +jupyter-events==0.9.0 +jupyter-lsp==2.2.2 +jupyter_client==8.6.0 +jupyter_core==5.7.1 +jupyter_server==2.12.5 +jupyter_server_terminals==0.5.2 +jupyterlab==4.1.0 +jupyterlab_pygments==0.3.0 +jupyterlab_server==2.25.2 +kiwisolver==1.4.5 +MarkupSafe==2.1.5 +matplotlib==3.8.2 matplotlib-inline==0.1.6 -mistune==2.0.5 -nbclient==0.8.0 -nbconvert==7.4.0 -nbformat==5.9.0 -nest-asyncio==1.5.6 -notebook @ git+https://github.com/jupyter/notebook@466b6bf2d7532f58e8e2861f350fd93e781c3ed3 +mistune==3.0.2 +nbclient==0.9.0 +nbconvert==7.16.0 +nbformat==5.9.2 +nest-asyncio==1.6.0 +notebook==7.0.7 notebook_shim==0.2.3 -numpy==1.24.3 -overrides==7.3.1 -packaging==23.1 -pandas==2.0.2 -pandocfilters==1.5.0 +numpy==1.26.4 +overrides==7.7.0 +packaging==23.2 +pandas==2.2.0 +pandocfilters==1.5.1 parso==0.8.3 -pexpect==4.8.0 -pickleshare==0.7.5 -Pillow==9.5.0 -platformdirs==3.5.1 -prometheus-client==0.17.0 -prompt-toolkit==3.0.38 -psutil==5.9.5 +pexpect==4.9.0 +pillow==10.2.0 +platformdirs==4.2.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.8 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 -Pygments==2.15.1 -pyparsing==3.0.9 -pyrsistent==0.19.3 +Pygments==2.17.2 +pyparsing==3.1.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -PyYAML==6.0 -pyzmq==25.1.0 +pytz==2024.1 +PyYAML==6.0.1 +pyzmq==25.1.2 +referencing==0.33.0 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -scipy==1.10.1 +rpds-py==0.17.1 +scipy==1.12.0 Send2Trash==1.8.2 six==1.16.0 sniffio==1.3.0 -soupsieve==2.4.1 -stack-data==0.6.2 -terminado==0.17.1 +soupsieve==2.5 +stack-data==0.6.3 +terminado==0.18.0 tinycss2==1.2.1 -tomli==2.0.1 -tornado==6.3.2 -traitlets==5.9.0 -typing_extensions==4.6.3 -tzdata==2023.3 -uri-template==1.2.0 -urllib3==2.0.3 -wcwidth==0.2.6 +tornado==6.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +tzdata==2023.4 +uri-template==1.3.0 +urllib3==2.2.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.5.2 -zipp==3.15.0 +websocket-client==1.7.0 diff --git a/requirements.txt b/requirements.txt index 078c525..e58af51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -notebook @ git+https://github.com/jupyter/notebook@466b6bf2d7532f58e8e2861f350fd93e781c3ed3 +notebook pandas scipy numpy