From 4078ca2901fd2e013c75179a456809181524ff73 Mon Sep 17 00:00:00 2001 From: marius Date: Wed, 14 Apr 2021 03:33:50 -0700 Subject: [PATCH] fix docs / upgrade docs to Julia 1.6 --- Dockerfile | 8 +++++--- docs/src/01_lense_a_map.md | 4 ++-- docs/src/02_posterior.md | 4 ++-- docs/src/03_joint_MAP_example.md | 4 ++-- docs/src/05_field_basics.md | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2991e13e..b5d37ff5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update \ ## install julia RUN mkdir /opt/julia \ - && curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.3-linux-x86_64.tar.gz | tar zxf - -C /opt/julia --strip=1 \ + && curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.6/julia-1.6.0-linux-x86_64.tar.gz | tar zxf - -C /opt/julia --strip=1 \ && chown -R 1000 /opt/julia \ && ln -s /opt/julia/bin/julia /usr/local/bin @@ -50,10 +50,12 @@ RUN curl https://pyenv.run | bash \ && pyenv global 3.7.3 ## install Python packages +# see https://github.com/jupyter/jupyter_client/issues/637 re: jupyter-client==6.1.12 RUN pip install --no-cache-dir \ cython \ julia \ - jupyterlab==3 \ + "jupyterlab>=3" \ + jupyter-client==6.1.12 \ jupytext \ matplotlib \ "nbconvert<6" \ @@ -88,7 +90,7 @@ COPY --chown=1000 Project.toml $HOME/CMBLensing/ COPY --chown=1000 docs/Project.toml $HOME/CMBLensing/docs/ RUN mkdir $HOME/CMBLensing/src && touch $HOME/CMBLensing/src/CMBLensing.jl ENV JULIA_PROJECT=$HOME/CMBLensing/docs -RUN julia -e 'using Pkg; pkg"dev ~/CMBLensing; instantiate"' \ +RUN JULIA_PKG_PRECOMPILE_AUTO=0 julia -e 'using Pkg; pkg"dev ~/CMBLensing; instantiate"' \ && rm -rf $HOME/.julia/conda/3/pkgs COPY --chown=1000 src $HOME/CMBLensing/src RUN (test $PRECOMPILE = 0 || julia -e 'using Pkg; pkg"precompile"') diff --git a/docs/src/01_lense_a_map.md b/docs/src/01_lense_a_map.md index dd597e15..12793961 100644 --- a/docs/src/01_lense_a_map.md +++ b/docs/src/01_lense_a_map.md @@ -8,9 +8,9 @@ jupyter: format_version: '1.2' jupytext_version: 1.4.1 kernelspec: - display_name: Julia 1.5.3 + display_name: Julia 1.6.0 language: julia - name: julia-1.5 + name: julia-1.6 --- # Lensing a flat-sky map diff --git a/docs/src/02_posterior.md b/docs/src/02_posterior.md index 4d91c342..2ae77152 100644 --- a/docs/src/02_posterior.md +++ b/docs/src/02_posterior.md @@ -8,9 +8,9 @@ jupyter: format_version: '1.2' jupytext_version: 1.4.1 kernelspec: - display_name: Julia 1.5.3 + display_name: Julia 1.6.0 language: julia - name: julia-1.5 + name: julia-1.6 --- # The Lensing Posterior diff --git a/docs/src/03_joint_MAP_example.md b/docs/src/03_joint_MAP_example.md index 5c284db5..11c4eed9 100644 --- a/docs/src/03_joint_MAP_example.md +++ b/docs/src/03_joint_MAP_example.md @@ -7,9 +7,9 @@ jupyter: format_version: '1.2' jupytext_version: 1.4.1 kernelspec: - display_name: Julia 1.5.3 + display_name: Julia 1.6.0 language: julia - name: julia-1.5 + name: julia-1.6 --- # MAP estimation diff --git a/docs/src/05_field_basics.md b/docs/src/05_field_basics.md index a1905d60..d126d055 100644 --- a/docs/src/05_field_basics.md +++ b/docs/src/05_field_basics.md @@ -7,9 +7,9 @@ jupyter: format_version: '1.2' jupytext_version: 1.4.1 kernelspec: - display_name: Julia 1.5.3 + display_name: Julia 1.6.0 language: julia - name: julia-1.5 + name: julia-1.6 --- # Field Basics