diff --git a/docker/Dockerfile b/docker/Dockerfile index 6b2852e..5daacee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,9 +40,9 @@ RUN jupyter nbextension enable toc2/main # from notebook.auth import passwd # passwd() # and take the hash from the output -RUN mkdir -p ${HOME}/.jupyter && \ - echo 'c.NotebookApp.password = u"sha1:c6bbcba2d04b:f969e403db876dcfbe26f47affe41909bd53392e"' \ - >> ${HOME}/.jupyter/jupyter_notebook_config.py +#RUN mkdir -p ${HOME}/.jupyter && \ +# echo 'c.NotebookApp.password = u"sha1:c6bbcba2d04b:f969e403db876dcfbe26f47affe41909bd53392e"' \ +# >> ${HOME}/.jupyter/jupyter_notebook_config.py ## INFO: Uncomment the RUN command below to disable git diff paging RUN git config --global core.pager '' @@ -65,13 +65,11 @@ RUN git-nbdiffdriver config --enable --global ## INFO: Optionally uncomment any (one) of the following RUN commands below to ignore either # metadata or details in nbdiff within git diff #RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-metadata' -RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-details' +#RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-details' -## -RUN ls -l /tmp/ +# INFO: Dirty nbdime patching COPY docker/nbdime-*.patch /tmp/ -RUN ls -l /tmp/ USER root WORKDIR / RUN patch -d /opt/conda/lib/python3.6/site-packages -p1 --forward --reject-file=- < \ @@ -86,3 +84,13 @@ WORKDIR ${workdir} COPY docker/bashrc /tmp/bashrc RUN cat /tmp/bashrc >> ${HOME}/.bashrc RUN sudo rm /tmp/bashrc + + +# INFO: Git filter testing +COPY docker/ipynb_cleaner.py /usr/bin/ipynb_cleaner +RUN mkdir -p ~/.config/git \ + && echo '*.ipynb filter=clean_ipynb' >> ~/.config/git/attributes \ + && git config --global filter.clean_ipynb.clean ipynb_cleaner \ + && git config --global filter.clean_ipynb.smudge cat + +# && git config --global filter.clean_ipynb.clean 'ipynb_cleaner %f' diff --git a/docker/ipynb_cleaner.py b/docker/ipynb_cleaner.py new file mode 100755 index 0000000..d34d7a6 --- /dev/null +++ b/docker/ipynb_cleaner.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python + +""" + +******************************** +DANGER - W.I.P. - TESTING ONLY!! +******************************** + +Clean jupyter notebook for git operations +Based on "Keeping IPython notebooks under Git version control" +(see: + https://gist.github.com/pbugnion/ea2797393033b54674af + http://pascalbugnion.net/blog/ipython-notebooks-and-git.html + http://stackoverflow.com/a/20844506/827862 +) +""" + +import sys +import json + +sys.stderr.write("\n\nCAUTION ! W.I.P ! Only dropping some test metadata, don't commit!\n\n") + +def log(x): + sys.stderr.write("\n\n[{}]\n\n\n".format(x)) +def logj(x): + sys.stderr.write("\n\n") + json.dump(x, sys.stderr, sort_keys=True, indent=1, separators=(",",": ")) + sys.stderr.write("\n\n") + +log(sys.argv) +#sys.exit(17) + +nb = sys.stdin.read() +json_in = json.loads(nb) + +logj(json_in["metadata"]) +del json_in["metadata"]["nav_menu"] +del json_in["metadata"]["toc"] +json_in["metadata"]["language_info"]["version"]="17.0" +logj(json_in["metadata"]) + +json.dump(json_in, sys.stdout, sort_keys=True, indent=1, separators=(",",": "))