diff --git a/base/Dockerfile b/base/Dockerfile index 97d89569cffb415494b6de10ae3fb5957be5df27..d6e14a379ec71e692fb75da8a10ae57c88c87ef3 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -37,9 +37,6 @@ RUN ln -s /mnt/user/shared /opt/app-root/src/shared ENV HOME=/opt/app-root/src/ -# temporarily downgrade pip to avoid failing build because of dependency conflicts (TODO: fix) -RUN pip install pip==20.0.2 - # install pip packages COPY base/requirements.txt /tmp RUN pip install --no-cache-dir -r /tmp/requirements.txt @@ -51,9 +48,7 @@ RUN jupyter labextension disable ipcluster \ # install additional labextensions (TODO: install with pip, if possible) RUN jupyter labextension install --no-build \ clb-jupyter-ext-query-params-dev@3.2.0 \ - clb-lab-extension@0.9.2 \ - ipycanvas@0.12.0 -# ipycanvas@0.12.0: Python part installed via spack (py-ipycanvas@0.12.0) + clb-lab-extension@0.9.2 RUN jupyter lab build diff --git a/base/requirements.txt b/base/requirements.txt index 59f75d92402ebe2eaa8db7d9aff808def0c7b8c3..2c03309db058d399818c914567c3e2703c6e7562 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,22 +1,11 @@ -bokeh==2.4.2 -ipympl==0.8.5 -ipywidgets==7.6.5 -jupyterlab-widgets==1.0.2 -jupyterlab-topbar==0.6.1 +git+https://github.com/HumanBrainProject/clb-nb-utils.git +ipympl==0.8.8 +ipywidgets==7.7.0 +jupyterlab==3.4.8 +jupyterlab-git==0.44.0 jupyterlab-system-monitor==0.8.0 -jupyterlab-git==0.34.1 -nbdime==3.1.1 -nbgitpuller==1.0.2 +jupyterlab-topbar==0.6.1 +jupyterlab-widgets==1.1.11 +nbdime==3.2.1 +nbgitpuller==1.2.2 nbresuse==0.4.0 -nglview==3.0.3 -pyOpenSSL==22.0.0 # TODO: Issue with 22.1 https://github.com/pyca/pyopenssl/issues/1154 -requests-oauthlib==1.3.0 -rise==5.7.1 -tvb-ext-bucket==1.0.0 -tvb-ext-unicore==1.2.0 -tvb-widgets==1.5.0 -tvb-ext-xircuits==1.1.0 -vincent==0.4.4 -widgetsnbextension==3.5.2 -xlrd==2.0.1 -git+https://github.com/HumanBrainProject/clb-nb-utils.git