Skip to content

Commit

Permalink
make everything compatible with jupyterlab=3.6.x (#280)
Browse files Browse the repository at this point in the history
* make everything compatible with jupyterlab=3.6.x

* increase size limit to 8G

* pin pytest as 8.1.0 not working

---------

Co-authored-by: Emma Ai <[email protected]>
  • Loading branch information
emmaai and Emma Ai authored Mar 5, 2024
1 parent 72833d7 commit ef03485
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ jobs:
uses: wemake-services/docker-image-size-limit@master
with:
image: ${{ env.ORG }}/${{ env.IMAGE}}:_build
size: "7 GiB"
size: "8 GiB"
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mambaorg/micromamba:git-e4f55ab-jammy as sandbox-conda
FROM mambaorg/micromamba:git-df79b72-jammy as sandbox-conda

USER root
COPY env.yaml /conf/
Expand All @@ -16,7 +16,7 @@ ENV CC=/env/bin/x86_64-conda_cos6-linux-gnu-gcc \
RUN micromamba run -p /env pip install --no-cache-dir \
--no-build-isolation -r /conf/requirements.txt

FROM ubuntu:jammy-20230816
FROM ubuntu:jammy-20240212

ARG nb_user=jovyan
ARG nb_uid=1000
Expand All @@ -38,7 +38,7 @@ ENV LC_ALL=C.UTF-8 \
USER $nb_user
# NOTE - JupyterLab extensions can now be distributed as prebuilt extensions and available to PyPI
RUN echo "Enable jupyter lab extensions" \
&& jupyter labextension install jupyterlab-theme-toggle \
&& jupyter labextension install jupyterlab-topbar-extension jupyterlab-theme-toggle \
&& jupyter labextension list \
&& echo "...done"

Expand Down
7 changes: 4 additions & 3 deletions docker/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies:
- datadog
- deepdiff
- defusedxml
- distributed
- distributed>=2023.11
- docutils
- ephem
- fiona
Expand Down Expand Up @@ -109,7 +109,7 @@ dependencies:
- pyrsistent
- pystac
- pystac-client
- pytest
- pytest!=8.1.0
- python-dateutil
- python-rapidjson
- python-slugify
Expand Down Expand Up @@ -221,7 +221,8 @@ dependencies:
- jupyterlab-topbar
- jupyterlab-system-monitor
- jupyterhub
- jupytext
- jupytext<1.14
- jupyterlab_pygments<0.3.0
- jupyter-resource-usage
- jupyter_server
- jupyter-server-proxy
Expand Down
3 changes: 3 additions & 0 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ jupyterlab-logout
jupyter-contrib-core
jupyter-contrib-nbextensions
jupyter-nbextensions-configurator
# pin for jupyterlab=3.x
jupyterlab-topbar-text==0.6.2
jupyterlab-logout==0.5.0

# ODC/DEA: these are installed in builder stage
otps
Expand Down

0 comments on commit ef03485

Please sign in to comment.