Skip to content

Commit 2c730af

Browse files
authored
Merge pull request #35 from LibreTexts/fix/gmt
Fixing gmt (Sarah Stewart's request for GEL298)
2 parents b97cd68 + 8c9e00d commit 2c730af

File tree

2 files changed

+540
-126
lines changed

2 files changed

+540
-126
lines changed

rich-default/Dockerfile

Lines changed: 3 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -32,103 +32,11 @@ RUN apt-get update && \
3232
texlive-full && \
3333
rm -rf /var/lib/apt/lists/*
3434

35-
#RUN apt-get update && \
36-
# apt-get install -y --no-install-recommends ffmpeg \
37-
# fonts-dejavu \
38-
# gfortran \
39-
# gcc \
40-
# octave \
41-
# octave-control \
42-
# octave-image \
43-
# octave-io \
44-
# octave-optim \
45-
# octave-signal\
46-
# octave-statistics && \
47-
# rm -rf /var/lib/apt/lists/*
48-
4935
USER $NB_UID
5036

51-
# Install Python 3 packages
52-
# Notes:
53-
# octave_kernel isn't compatible with Python> 3.7 as pinned in the base-notebook,
54-
# so manually downgrading to Python 3.6.*
55-
# r-sf added in 1.9, staging jupyter not working
56-
# nodejs and ipyml added in 1.9, staging jupyter not working
57-
RUN conda install --quiet --yes \
58-
'conda-forge::blas=*=openblas' \
59-
'python=3.6.*' \
60-
'jupyterlab=1.*' \
61-
'nbconvert=5.4.*' \
62-
'ipywidgets' \
63-
'ipympl' \
64-
'pythreejs' \
65-
'ipyleaflet' \
66-
'resonance' \
67-
'opty' \
68-
'pandas' \
69-
'pydy' \
70-
'numexpr' \
71-
'matplotlib' \
72-
'nodejs' \
73-
'scipy' \
74-
'seaborn' \
75-
'scikit-learn' \
76-
'scikit-image' \
77-
'sympy' \
78-
'cython' \
79-
'numba' \
80-
'bokeh' \
81-
'numpy' \
82-
'astropy' \
83-
'bqplot' \
84-
'nb_conda_kernels' \
85-
'statsmodels' \
86-
'patsy' \
87-
'requests' \
88-
'cloudpickle' \
89-
'dill' \
90-
'dask' \
91-
'sqlalchemy*' \
92-
'hdf5' \
93-
'h5py' \
94-
'vincent' \
95-
'beautifulsoup4' \
96-
'protobuf' \
97-
'xlrd' \
98-
'numba' \
99-
'gnuplot' \
100-
'ghostscript' \
101-
'octave_kernel' \
102-
'rpy2' \
103-
'r-base' \
104-
'r-irkernel' \
105-
'r-plyr' \
106-
'r-devtools' \
107-
'r-tidyverse' \
108-
'r-shiny' \
109-
'r-shinydashboard' \
110-
'r-rmarkdown' \
111-
'r-leaflet' \
112-
'r-httr' \
113-
'r-forecast' \
114-
'r-rsqlite' \
115-
'r-reshape2' \
116-
'r-nycflights13' \
117-
'r-caret' \
118-
'r-rcurl' \
119-
'r-crayon' \
120-
'r-randomforest' \
121-
'r-htmltools' \
122-
'r-sparklyr' \
123-
'r-htmlwidgets' \
124-
'r-hexbin' \
125-
'r-sf' \
126-
'rdkit::rdkit' \
127-
'samoturk::pymol' \
128-
'mordred-descriptor::mordred' \
129-
'pmw' && \
130-
# Update the pinned version of Python
131-
conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \
37+
COPY environment.yml environment.yml
38+
39+
RUN conda env update --name base --file environment.yml --prune && \
13240
conda clean --all -f -y && \
13341
# Activate ipywidgets extension in the environment that runs the notebook server
13442
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
@@ -233,37 +141,6 @@ RUN apt-get update && \
233141
apt-get clean
234142
ENV PATH=$PATH:/usr/lib/rstudio-server/bin
235143

236-
# Installs the jupyter-rsession-proxy extension
237-
RUN conda install -yq -c conda-forge jupyter-rsession-proxy && \
238-
conda clean -tipsy
239-
240-
# Install pymol
241-
#RUN conda install -yq -c schrodinger pymol
242-
243-
# Install ipymol
244-
# Installs from a git repo because pymol fetch fails when installing the pip package
245-
RUN pip install git+https://github.com/cxhernandez/ipymol.git@2a30d6ec1588434e6f0f72a1d572444f89ff535b
246-
247-
RUN pip install pypdb
248-
RUN pip install biopandas
249-
250-
USER $NB_USER
251-
252-
253-
# The following is an attempt to configure nb_conda_kernels automatically
254-
#WORKDIR $HOME
255-
#
256-
#USER root
257-
#
258-
#RUN echo "test" > $HOME/test.txt
259-
#
260-
## Create a folder of conda environments in the user's directory
261-
#RUN conda config && \
262-
# > $HOME/.condarc && \
263-
# echo "envs_dirs:" >> $HOME/.condarc && \
264-
# echo " -/home/jovyan/my-conda-envs/" >> $HOME/.condarc
265-
266-
267144
USER $NB_UID
268145

269146
# for some reason, need to rebuild it to make widgets work

0 commit comments

Comments
 (0)