Skip to content

Commit

Permalink
fix docs / upgrade docs to Julia 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
marius311 committed Apr 14, 2021
1 parent 4fc14e9 commit 4078ca2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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" \
Expand Down Expand Up @@ -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"')
Expand Down
4 changes: 2 additions & 2 deletions docs/src/01_lense_a_map.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/src/02_posterior.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/src/03_joint_MAP_example.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/src/05_field_basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

2 comments on commit 4078ca2

@marius311
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: "Tag with name v0.5.1 already exists and points to a different commit"

Please sign in to comment.