Skip to content

Commit ffffdd9

Browse files
authored
Merge pull request #9 from uw-it-aca/pm-update_scipy
added astroalign and fixed build error with biogeme
2 parents f726e70 + 1d595ec commit ffffdd9

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed

scipy/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ LABEL maintainer="UW-IT AXDD <[email protected]>"
1010
# bokeh, sqlalchemy, hdf5, vincent, beautifulsoup, protobuf, xlrd, bottleneck,
1111
# pytables, ipywidgets, ipympl, facets
1212

13-
1413
RUN set -ex \
1514
&& conda install --quiet --yes \
1615
'plotly==4.14.3' \
@@ -52,6 +51,7 @@ RUN set -ex \
5251

5352
# Install Python 3 packages
5453
RUN pip install \
54+
astroalign \
5555
requests-html \
5656
joblib \
5757
tqdm \
@@ -60,7 +60,6 @@ RUN pip install \
6060
fuzzywuzzy \
6161
pqdm \
6262
qgrid \
63-
biogeme \
6463
nbresuse==0.3.3 \
6564
nbgitpuller && \
6665
jupyter serverextension enable --py nbresuse --sys-prefix && \
@@ -70,10 +69,14 @@ RUN pip install \
7069

7170
USER root
7271

73-
RUN apt-get update && apt-get install -y vim gcc openssh-client
72+
RUN apt-get update && apt-get install -y vim gcc openssh-client build-essential
7473

7574
# RUN echo 'export LD_LIBRARY_PATH=/usr/local/nvidia/lib64' >> /etc/profile
7675
# RUN echo 'export PATH=$PATH:/usr/local/nvidia/bin'>> /etc/profile
7776
# COPY kernel.json /opt/conda/share/jupyter/kernels/python3/kernel.json
7877

7978
USER $NB_UID
79+
80+
# biogeme failed to install without an interactive bash shell
81+
SHELL ["/bin/bash", "--login", "-c", "-i"]
82+
RUN pip install biogeme

scipy/README.md

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ via `pip list`
1616

1717
| Package | Version |
1818
| ----------------------------- | ------------------- |
19-
| absl-py | 0.12.0 |
20-
| aiohttp | 3.7.4 |
19+
| absl-py | 0.13.0 |
20+
| aiohttp | 3.7.4.post0 |
2121
| alembic | 1.6.0 |
2222
| anyio | 2.2.0 |
2323
| appdirs | 1.4.4 |
2424
| argon2-cffi | 20.1.0 |
2525
| arviz | 0.11.2 |
26-
| asdf | 2.8.0 |
26+
| asdf | 2.8.1 |
2727
| asteval | 0.9.23 |
28+
| astroalign | 2.4 |
2829
| astroML | 0.4.1 |
2930
| astroplan | 0.8 |
3031
| astropy | 4.2.1 |
@@ -39,14 +40,14 @@ via `pip list`
3940
| backports.functools-lru-cache | 1.6.4 |
4041
| beautifulsoup4 | 4.9.3 |
4142
| biogeme | 3.2.6 |
42-
| black | 21.5b1 |
43+
| black | 21.5b2 |
4344
| bleach | 3.3.0 |
4445
| blinker | 1.4 |
4546
| blis | 0.7.4 |
4647
| bokeh | 2.3.1 |
4748
| boto | 2.49.0 |
48-
| boto3 | 1.17.79 |
49-
| botocore | 1.20.79 |
49+
| boto3 | 1.17.99 |
50+
| botocore | 1.20.100 |
5051
| Bottleneck | 1.3.2 |
5152
| bounded-pool-executor | 0.0.3 |
5253
| brotlipy | 0.7.0 |
@@ -56,7 +57,7 @@ via `pip list`
5657
| cachetools | 4.2.2 |
5758
| catalogue | 2.0.4 |
5859
| ccdproc | 2.2.0 |
59-
| certifi | 2020.12.5 |
60+
| certifi | 2021.5.30 |
6061
| certipy | 0.1.3 |
6162
| cffi | 1.14.5 |
6263
| cftime | 1.5.0 |
@@ -95,21 +96,21 @@ via `pip list`
9596
| gatspy | 0.3 |
9697
| gensim | 4.0.1 |
9798
| gmpy2 | 2.1.0b1 |
98-
| google-api-core | 1.26.3 |
99-
| google-auth | 1.30.0 |
100-
| google-cloud-core | 1.5.0 |
101-
| google-cloud-storage | 1.19.0 |
99+
| google-api-core | 1.30.0 |
100+
| google-auth | 1.30.2 |
101+
| google-cloud-core | 1.7.0 |
102+
| google-cloud-storage | 1.38.0 |
102103
| google-crc32c | 1.1.2 |
103-
| google-resumable-media | 1.2.0 |
104+
| google-resumable-media | 1.3.0 |
104105
| googleapis-common-protos | 1.53.0 |
105106
| greenlet | 1.0.0 |
106-
| grpcio | 1.38.0 |
107+
| grpcio | 1.38.1 |
107108
| gwcs | 0.16.1 |
108109
| h5py | 3.1.0 |
109110
| HeapDict | 1.0.1 |
110111
| hickle | 3.4.5 |
111112
| html5lib | 1.1 |
112-
| hypothesis | 6.13.5 |
113+
| hypothesis | 6.14.0 |
113114
| idna | 2.10 |
114115
| imagecodecs | 2021.3.31 |
115116
| imageio | 2.9.0 |
@@ -121,7 +122,7 @@ via `pip list`
121122
| ipython | 7.23.0 |
122123
| ipython-genutils | 0.2.0 |
123124
| ipywidgets | 7.6.3 |
124-
| jax | 0.2.13 |
125+
| jax | 0.2.16 |
125126
| jaxlib | 0.1.67 |
126127
| jdcal | 1.4.1 |
127128
| jedi | 0.18.0 |
@@ -141,7 +142,7 @@ via `pip list`
141142
| jupyterlab-pygments | 0.1.2 |
142143
| jupyterlab-server | 2.5.0 |
143144
| jupyterlab-widgets | 1.0.0 |
144-
| keyring | 23.0.1 |
145+
| keyring | 22.3.0 |
145146
| kiwisolver | 1.3.1 |
146147
| llvmlite | 0.36.0 |
147148
| lmfit | 1.0.2 |
@@ -167,10 +168,10 @@ via `pip list`
167168
| nbclient | 0.5.3 |
168169
| nbconvert | 6.0.7 |
169170
| nbformat | 5.1.3 |
170-
| nbgitpuller | 0.9.0 |
171+
| nbgitpuller | 0.10.1 |
171172
| nbresuse | 0.3.3 |
172173
| nest-asyncio | 1.5.1 |
173-
| netCDF4 | 1.5.6 |
174+
| netCDF4 | 1.5.7 |
174175
| networkx | 2.5 |
175176
| nltk | 3.6.2 |
176177
| notebook | 6.3.0 |
@@ -216,7 +217,7 @@ via `pip list`
216217
| pycurl | 7.43.0.6 |
217218
| pydantic | 1.7.3 |
218219
| pyee | 8.1.0 |
219-
| pyerfa | 1.7.3 |
220+
| pyerfa | 2.0.0 |
220221
| Pygments | 2.8.1 |
221222
| pygpu | 0.7.6 |
222223
| PyJWT | 2.1.0 |
@@ -233,7 +234,7 @@ via `pip list`
233234
| pytest-arraydiff | 0.3 |
234235
| pytest-astropy | 0.8.0 |
235236
| pytest-astropy-header | 0.1.2 |
236-
| pytest-cov | 2.12.0 |
237+
| pytest-cov | 2.12.1 |
237238
| pytest-doctestplus | 0.9.0 |
238239
| pytest-filter-subpackage | 0.1.1 |
239240
| pytest-mock | 3.6.1 |
@@ -244,6 +245,7 @@ via `pip list`
244245
| python-json-logger | 2.0.1 |
245246
| python-mimeparse | 1.6.0 |
246247
| pytz | 2021.1 |
248+
| pyu2f | 0.1.5 |
247249
| pyvo | 1.1 |
248250
| PyWavelets | 1.1.1 |
249251
| PyYAML | 5.4.1 |
@@ -269,6 +271,7 @@ via `pip list`
269271
| semantic-version | 2.8.5 |
270272
| semver | 2.13.0 |
271273
| Send2Trash | 1.5.0 |
274+
| sep | 1.2.0 |
272275
| setuptools | 49.6.0.post20210108 |
273276
| shellingham | 1.4.0 |
274277
| six | 1.15.0 |
@@ -278,7 +281,7 @@ via `pip list`
278281
| sortedcontainers | 2.3.0 |
279282
| soupsieve | 2.0.1 |
280283
| spacy | 3.0.6 |
281-
| spacy-legacy | 3.0.5 |
284+
| spacy-legacy | 3.0.6 |
282285
| SQLAlchemy | 1.4.13 |
283286
| srsly | 2.4.1 |
284287
| statsmodels | 0.12.2 |
@@ -315,7 +318,7 @@ via `pip list`
315318
| widgetsnbextension | 3.5.1 |
316319
| xarray | 0.18.2 |
317320
| xlrd | 2.0.1 |
318-
| yarl | 1.6.3 |
321+
| yarl | 1.5.1 |
319322
| zict | 2.0.0 |
320323
| zipp | 3.4.1 |
321324

0 commit comments

Comments
 (0)