Commit 9b58b2f2 authored by Joseph Weston's avatar Joseph Weston
Browse files

remove dev environment and rename default environment

parent de536d02
......@@ -39,13 +39,10 @@ COPY profile.sh /etc/profile.d/
# Add environment files
RUN mkdir /environments
COPY python3.yml dev.yml install_dev.sh /environments/
COPY machine-learning.yml /environments/
# Update the root environment
RUN conda env update -n root -f /environments/python3.yml
# Add a dev environment (e.g. with dev kwant and holoviews)
# RUN conda env create -p /opt/conda/envs/dev -f /environments/dev.yml
RUN conda env update -n root -f /environments/machine-learning.yml
# Enable `jupyter nbextension`s
RUN jupyter nbextension enable --py --sys-prefix ipyparallel && \
......@@ -67,9 +64,7 @@ COPY git* /etc/
# Create parallel profiles and copy the correct config
RUN ipython profile create --parallel --profile python3 --ipython-dir /opt/conda/etc/ipython
# RUN ipython profile create --parallel --profile dev --ipython-dir /opt/conda/etc/ipython
COPY ipcluster_config_python3.py /opt/conda/etc/ipython/profile_python3/ipcluster_config.py
# COPY ipcluster_config_dev.py /opt/conda/etc/ipython/profile_dev/ipcluster_config.py
# setting openblas and mkl variables
ENV OPENBLAS_NUM_THREADS=1\
......
name: dev
channels:
- kwant
- ioam
- conda-forge
dependencies:
# general numerics
- python=3.6
- anaconda
- kwant=dev
- discretizer=0.4*
- cython
# fenics
- fenics
- mshr
# plotting and serialization
- deepdish
- plotly
# parallell computing
- dill
- distributed
- hpc05
- ipyparallel
# other
- line_profiler
- boost
- feedparser
- pytest-flakes
- python-graphviz
- xarray
- pillow
- ipykernel>=4.8* # needed for adaptive
- jupyter_client>=5.2.2 # needed for adaptive
- ipywidgets
- pip:
- git+https://github.com/ioam/holoviews.git
- git+https://github.com/python-adaptive/adaptive.git
conda clean --yes --all # so we don't run into space issues
conda config --system --add envs_dirs ~/.conda/envs # because of https://gitlab.kwant-project.org/qt/research-docker/issues/4
source deactivate # make sure we are not using the dev env now
conda env remove --yes --name dev
CONDA_ALWAYS_COPY=true conda env create --file /environments/dev.yml
conda clean --yes --all # so we don't run into space issues
name: python3
name: machine-learning
channels:
- conda-forge
dependencies:
......@@ -19,7 +19,7 @@ dependencies:
- holoviews=1.10*
- plotly
- ipympl # interactive plotting in jupyterlab
# parallell computing
# parallel computing
- dill
- distributed
- hpc05
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment