Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging 5174/5176/5178 to prod #5179

Merged
merged 13 commits into from
Oct 31, 2023
Merged

merging 5174/5176/5178 to prod #5179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
38fffd9
s/opt/srv
shaneknapp Oct 30, 2023
2fb980c
debump python, seriously bump mambaforge
shaneknapp Oct 30, 2023
d66071f
typo
shaneknapp Oct 30, 2023
084acc0
wtf
shaneknapp Oct 30, 2023
62583ff
s/2/3
shaneknapp Oct 30, 2023
3ff3037
fix nodejs version
shaneknapp Oct 30, 2023
7d473a7
Merge pull request #5174 from shaneknapp/testing-julia-build
shaneknapp Oct 30, 2023
76662fa
debump traitlets to unbreak things
shaneknapp Oct 30, 2023
af9b581
bump notebook, stop pinning traitlets
shaneknapp Oct 30, 2023
a1f75b1
twice as equals
shaneknapp Oct 30, 2023
df084c0
Merge pull request #5176 from shaneknapp/dh66-traitlets-srsly
shaneknapp Oct 31, 2023
d44417f
debump traitlets
shaneknapp Oct 31, 2023
a4f8764
Merge pull request #5178 from shaneknapp/finally-fix-julia
shaneknapp Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deployments/julia/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ENV NB_USER jovyan
ENV NB_UID 1000
ENV SHELL /bin/bash

ENV CONDA_DIR /opt/conda
ENV JULIA_DIR /opt/julia
ENV CONDA_DIR /srv/conda
ENV JULIA_DIR /srv/julia

ENV PATH ${JULIA_DIR}/bin:${CONDA_DIR}/bin:$PATH

Expand Down
8 changes: 6 additions & 2 deletions deployments/julia/image/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
dependencies:
- nodejs==18.*
- nodejs==20.8.1
- pip==22.3.1
- python==3.11.*
- python==3.10.13
- requests==2.31.0

- syncthing==1.18.6

# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048
- traitlets=5.9.*

# from requirements.txt
- matplotlib==3.7.2

Expand All @@ -15,5 +18,6 @@ dependencies:
# For https://github.com/berkeley-dsep-infra/datahub/issues/3079
- websockify
- pip:
- notebook==6.5.6
- jupyter-desktop-server
- otter-grader==3.1.4
2 changes: 1 addition & 1 deletion deployments/julia/image/install-mambaforge.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -ex

cd $(dirname $0)
MAMBAFORGE_VERSION=4.10.3-7
MAMBAFORGE_VERSION='23.3.1-1'

URL="https://github.com/conda-forge/miniforge/releases/download/${MAMBAFORGE_VERSION}/Mambaforge-${MAMBAFORGE_VERSION}-Linux-x86_64.sh"
INSTALLER_PATH=/tmp/mambaforge-installer.sh
Expand Down