Skip to content

Commit

Permalink
Merge pull request #52 from NVIDIA/dev2.6
Browse files Browse the repository at this point in the history
feat: 2.6.0-dev -> 2.6.0
feat: Add adlfs, dask-glm, dask-ml, and jupyterlab-nvdashboard to default environment
feat: Respect NOTEBOOKS_DIR if set in the user's environment (#49)
feat: Update default stacks to RAPIDS 0.17
feat: Start 2.6.0-dev branch
  • Loading branch information
beberg committed Dec 18, 2020
2 parents 53dd3f4 + 7024af5 commit ba575ba
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 94 deletions.
6 changes: 3 additions & 3 deletions data-science-stack
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.

# Global Paramaters
STACK_VERSION=2.5.1
STACK_VERSION=2.6.0
NOTEBOOKS_VERSION=0.16

MIN_DRIVER=455.23.04
Expand All @@ -17,7 +17,8 @@ DEFAULT_ENVIRONMENT="data-science-stack"
LOGFILE=data-science-stack.log

CONDA_ROOT=${HOME}/conda
NOTEBOOKS_DIR=${HOME}/data-science-stack-${STACK_VERSION}
DEFAULT_NOTEBOOKS_DIR=${HOME}/data-science-stack-${STACK_VERSION}
NOTEBOOKS_DIR=${NOTEBOOKS_DIR:-$DEFAULT_NOTEBOOKS_DIR}

if [ -f /etc/redhat-release ]; then
if grep -q -i "release 7" /etc/redhat-release ; then
Expand Down Expand Up @@ -535,7 +536,6 @@ create_conda_env () {
fi

source ${CONDA_ROOT}/bin/activate ${ENVIRONMENT_NAME}-${STACK_VERSION} ; \
pip install jupyterlab-nvdashboard ; \
jupyter labextension install -y --clean \
@jupyter-widgets/jupyterlab-manager \
jupyter-threejs \
Expand Down
3 changes: 1 addition & 2 deletions data-science-stack.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --fix-missing \

# Create Base environment

ARG STACK_VERSION=2.5.1
ARG STACK_VERSION=2.6.0
ARG CONDA_VERSION=4.8.3
ARG RAPIDS_VERSION=0.16

Expand Down Expand Up @@ -65,7 +65,6 @@ RUN ${CONDA_ROOT}/bin/conda env create -n data-science-stack-${STACK_VERSION} \
-f /environment-pinned.yaml \
&& echo "conda activate data-science-stack-${STACK_VERSION}" >> ${HOME}/.bashrc \
&& bash -c 'source ${CONDA_ROOT}/bin/activate data-science-stack-${STACK_VERSION} ; \
pip install jupyterlab-nvdashboard ; \
jupyter labextension install -y --clean \
@jupyter-widgets/jupyterlab-manager \
jupyter-threejs \
Expand Down

0 comments on commit ba575ba

Please sign in to comment.