Skip to content

Commit

Permalink
fix: Add mls library from GitHub (#8)
Browse files Browse the repository at this point in the history
* Add mls library from GitHub to allow for helper utilities like locate_data
   - Use hashable URL for piptools to generate hashes (of the form
     https://github.com/<repo org>/<repo name>/archive/<commit hash>.zip)
   - Add emcee as required by mls
* Add tables as required by pandas.read_hdf()
* Use stable base image tag jupyter/minimal-notebook:lab-3.2.8
* Restrict pip<22.0 given pip-tools bug jazzband/pip-tools#1558
  • Loading branch information
matthewfeickert authored Jan 31, 2022
1 parent ac21b22 commit 0b29e4f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: image

defualt: image

BASE_IMAGE="jupyter/minimal-notebook:latest"
BASE_IMAGE="jupyter/minimal-notebook:lab-3.2.8"

image:
docker pull $(BASE_IMAGE)
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=jupyter/minimal-notebook:latest
ARG BASE_IMAGE=jupyter/minimal-notebook:lab-3.2.8
FROM ${BASE_IMAGE} as base

USER root
Expand Down Expand Up @@ -28,7 +28,7 @@ COPY docker/requirements.txt /requirements.txt
# sdist.
RUN mkdir -p "/home/${NB_USER}/.local" && \
cp /requirements.txt "/home/${NB_USER}/.local/requirements.txt" && \
python -m pip --no-cache-dir install --upgrade pip setuptools wheel && \
python -m pip --no-cache-dir install --upgrade 'pip<22.0' setuptools wheel && \
python -m pip --no-cache-dir install pip-tools && \
python -m piptools compile \
--generate-hashes \
Expand Down
4 changes: 4 additions & 0 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# pydata tooling
scipy~=1.7.3
pandas~=1.3.5
tables~=3.7.0 # required by pandas.read_hdf
seaborn~=0.11.2
# machine learning
scikit-learn~=1.0.2
Expand All @@ -13,6 +14,9 @@ uproot~=4.1.9
awkward~=1.7.0
hist~=2.5.2
vector~=0.8.4
# course specific
https://github.com/dkirkby/MachineLearningStatistics/archive/3aa7385e1fd0b1572013bdf1f1c823806b744b2d.zip#egg=mls
emcee~=3.1.1 # required by mls
# jupyter
# jupyter and jupyterlab provided by the base image
jupyterlab-widgets~=1.0.2
Expand Down

0 comments on commit 0b29e4f

Please sign in to comment.