Skip to content

Commit 7fdacfe

Browse files
authored
Merge pull request #12 from gjbex/development
Minor updates
2 parents b4b7ca0 + 4a41fb3 commit 7fdacfe

File tree

3 files changed

+307
-150
lines changed

3 files changed

+307
-150
lines changed

environment.yml

Lines changed: 199 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,216 @@ channels:
33
- defaults
44
dependencies:
55
- _libgcc_mutex=0.1=main
6-
- argon2-cffi=20.1.0=py37h7b6447c_1
7-
- attrs=19.3.0=py_0
8-
- backcall=0.2.0=py_0
6+
- _openmp_mutex=4.5=1_gnu
7+
- anyio=2.2.0=py37h06a4308_1
8+
- argcomplete=1.12.3=pyhd3eb1b0_0
9+
- argon2-cffi=20.1.0=py37h27cfd23_1
10+
- async_generator=1.10=py37h28b3542_0
11+
- attrs=21.2.0=pyhd3eb1b0_0
12+
- babel=2.9.1=pyhd3eb1b0_0
13+
- backcall=0.2.0=pyhd3eb1b0_0
914
- blas=1.0=mkl
10-
- bleach=3.1.5=py_0
11-
- blosc=1.19.0=hd408876_0
12-
- bokeh=2.1.1=py37_0
13-
- brotlipy=0.7.0=py37h7b6447c_1000
15+
- bleach=4.0.0=pyhd3eb1b0_0
16+
- blosc=1.21.0=h8c45485_0
17+
- bokeh=2.4.2=py37h06a4308_0
18+
- bottleneck=1.3.2=py37heb32a55_1
19+
- brotli=1.0.9=he6710b0_2
20+
- brotlipy=0.7.0=py37h27cfd23_1003
21+
- brunsli=0.1=h2531618_0
1422
- bzip2=1.0.8=h7b6447c_0
15-
- ca-certificates=2020.6.24=0
16-
- cairo=1.14.12=h8948797_3
17-
- certifi=2020.6.20=py37_0
18-
- cffi=1.14.1=py37he30daa8_0
19-
- chardet=3.0.4=py37_1003
20-
- cloudpickle=1.5.0=py_0
21-
- cryptography=2.9.2=py37h1ba5d50_0
22-
- cycler=0.10.0=py37_0
23-
- cytoolz=0.10.1=py37h7b6447c_0
24-
- dask-core=2.22.0=py_0
25-
- dbus=1.13.16=hb2f20db_0
26-
- decorator=4.4.2=py_0
27-
- defusedxml=0.6.0=py_0
23+
- c-ares=1.17.1=h27cfd23_0
24+
- ca-certificates=2021.10.26=h06a4308_2
25+
- cairo=1.16.0=hf32fb01_1
26+
- certifi=2021.10.8=py37h06a4308_0
27+
- cffi=1.14.6=py37h400218f_0
28+
- cfitsio=3.470=hf0d0db6_6
29+
- chardet=4.0.0=py37h06a4308_1003
30+
- charls=2.2.0=h2531618_0
31+
- charset-normalizer=2.0.4=pyhd3eb1b0_0
32+
- cloudpickle=2.0.0=pyhd3eb1b0_0
33+
- cryptography=35.0.0=py37hd23ed53_0
34+
- cycler=0.11.0=pyhd3eb1b0_0
35+
- cytoolz=0.11.0=py37h7b6447c_0
36+
- dask-core=2021.10.0=pyhd3eb1b0_0
37+
- dbus=1.13.18=hb2f20db_0
38+
- debugpy=1.5.1=py37h295c915_0
39+
- decorator=5.1.0=pyhd3eb1b0_0
40+
- defusedxml=0.7.1=pyhd3eb1b0_0
2841
- entrypoints=0.3=py37_0
29-
- expat=2.2.9=he6710b0_2
42+
- expat=2.4.1=h2531618_2
3043
- fastcache=1.1.0=py37h7b6447c_0
3144
- ffmpeg=4.0=hcdf2ecd_0
32-
- fontconfig=2.13.0=h9420a91_0
45+
- fontconfig=2.13.1=h6c09931_0
46+
- fonttools=4.25.0=pyhd3eb1b0_0
3347
- freeglut=3.0.0=hf484d3e_5
34-
- freetype=2.10.2=h5ab3b9f_0
35-
- glib=2.65.0=h3eb4bd4_0
36-
- gmp=6.1.2=h6c8ec71_1
48+
- freetype=2.11.0=h70c0345_0
49+
- fsspec=2021.10.1=pyhd3eb1b0_0
50+
- giflib=5.2.1=h7b6447c_0
51+
- glib=2.69.1=h5202010_0
52+
- gmp=6.2.1=h2531618_2
3753
- gmpy2=2.0.8=py37h10f8cd9_2
3854
- graphite2=1.3.14=h23475e2_0
39-
- gst-plugins-base=1.14.0=hbbd80ab_1
40-
- gstreamer=1.14.0=hb31296c_0
55+
- gst-plugins-base=1.14.0=h8213a91_2
56+
- gstreamer=1.14.0=h28cd5cc_2
4157
- harfbuzz=1.8.8=hffaf4a1_0
4258
- hdf5=1.10.2=hba1933b_1
4359
- icu=58.2=he6710b0_3
44-
- idna=2.10=py_0
45-
- imageio=2.9.0=py_0
46-
- importlib-metadata=1.7.0=py37_0
47-
- importlib_metadata=1.7.0=0
48-
- intel-openmp=2020.1=217
49-
- ipykernel=5.3.4=py37h5ca1d4c_0
50-
- ipython=7.17.0=py37h39e3cac_0
51-
- ipython_genutils=0.2.0=py37_0
52-
- ipywidgets=7.5.1=py_0
53-
- jasper=2.0.14=h07fcdf6_1
54-
- jedi=0.15.1=py37_0
55-
- jinja2=2.11.2=py_0
56-
- jpeg=9b=h024ee3a_2
57-
- json5=0.9.5=py_0
58-
- jsonschema=3.2.0=py37_1
60+
- idna=3.3=pyhd3eb1b0_0
61+
- imagecodecs=2021.8.26=py37h4cda21f_0
62+
- imageio=2.9.0=pyhd3eb1b0_0
63+
- importlib-metadata=4.8.2=py37h06a4308_0
64+
- importlib_metadata=4.8.2=hd3eb1b0_0
65+
- intel-openmp=2021.4.0=h06a4308_3561
66+
- ipykernel=6.4.1=py37h06a4308_1
67+
- ipython=7.29.0=py37hb070fc8_0
68+
- ipython_genutils=0.2.0=pyhd3eb1b0_1
69+
- ipywidgets=7.6.5=pyhd3eb1b0_1
70+
- jasper=2.0.14=hd8c5072_2
71+
- jedi=0.18.0=py37h06a4308_1
72+
- jinja2=3.0.2=pyhd3eb1b0_0
73+
- jpeg=9d=h7f8727e_0
74+
- json5=0.9.6=pyhd3eb1b0_0
75+
- jsonschema=3.2.0=pyhd3eb1b0_2
5976
- jupyter=1.0.0=py37_7
60-
- jupyter_client=6.1.6=py_0
61-
- jupyter_console=6.1.0=py_0
62-
- jupyter_core=4.6.3=py37_0
63-
- jupyterlab=2.1.5=py_0
64-
- jupyterlab_server=1.2.0=py_0
65-
- kiwisolver=1.2.0=py37hfd86e86_0
66-
- lcms2=2.11=h396b838_0
67-
- ld_impl_linux-64=2.33.1=h53a641e_7
68-
- libedit=3.1.20191231=h14c3975_1
77+
- jupyter_client=7.0.6=pyhd3eb1b0_0
78+
- jupyter_console=6.4.0=pyhd3eb1b0_0
79+
- jupyter_core=4.9.1=py37h06a4308_0
80+
- jupyter_server=1.4.1=py37h06a4308_0
81+
- jupyterlab=3.2.1=pyhd3eb1b0_1
82+
- jupyterlab_pygments=0.1.2=py_0
83+
- jupyterlab_server=2.8.2=pyhd3eb1b0_0
84+
- jupyterlab_widgets=1.0.0=pyhd3eb1b0_1
85+
- jxrlib=1.1=h7b6447c_2
86+
- kiwisolver=1.3.1=py37h2531618_0
87+
- krb5=1.19.2=hac12032_0
88+
- lcms2=2.12=h3be6417_0
89+
- ld_impl_linux-64=2.35.1=h7274673_9
90+
- lerc=3.0=h295c915_0
91+
- libaec=1.0.4=he6710b0_1
92+
- libcurl=7.80.0=h0b77cf5_0
93+
- libdeflate=1.8=h7f8727e_5
94+
- libedit=3.1.20210910=h7f8727e_0
95+
- libev=4.33=h7f8727e_1
6996
- libffi=3.3=he6710b0_2
70-
- libgcc-ng=9.1.0=hdf63c60_0
71-
- libgfortran-ng=7.3.0=hdf63c60_0
97+
- libgcc-ng=9.3.0=h5101ec6_17
98+
- libgfortran-ng=7.5.0=ha8ba4b0_17
99+
- libgfortran4=7.5.0=ha8ba4b0_17
72100
- libglu=9.0.0=hf484d3e_1
101+
- libgomp=9.3.0=h5101ec6_17
102+
- libnghttp2=1.46.0=hce63b2e_0
103+
- libopencv=3.4.2=hb342d67_1
104+
- libopus=1.3.1=h7b6447c_0
105+
- libpng=1.6.37=hbc83047_0
106+
- libsodium=1.0.18=h7b6447c_0
107+
- libssh2=1.9.0=h1ba5d50_1
108+
- libstdcxx-ng=9.3.0=hd4cf53a_17
109+
- libtiff=4.2.0=h85742a9_0
110+
- libuuid=1.0.3=h7f8727e_2
111+
- libvpx=1.7.0=h439df22_0
112+
- libwebp=1.2.0=h89dd481_0
113+
- libwebp-base=1.2.0=h27cfd23_0
114+
- libxcb=1.14=h7b6447c_0
115+
- libxml2=2.9.12=h03d6c58_0
116+
- libzopfli=1.0.3=he6710b0_0
117+
- locket=0.2.1=py37h06a4308_1
118+
- lz4-c=1.9.3=h295c915_1
119+
- lzo=2.10=h7b6447c_2
120+
- markupsafe=2.0.1=py37h27cfd23_0
121+
- matplotlib=3.5.0=py37h06a4308_0
122+
- matplotlib-base=3.5.0=py37h3ed280b_0
123+
- matplotlib-inline=0.1.2=pyhd3eb1b0_2
124+
- mistune=0.8.4=py37h14c3975_1001
125+
- mkl=2021.4.0=h06a4308_640
126+
- mkl-service=2.4.0=py37h7f8727e_0
127+
- mkl_fft=1.3.1=py37hd3c417c_0
128+
- mkl_random=1.2.2=py37h51133e4_0
129+
- mpc=1.1.0=h10f8cd9_1
130+
- mpfr=4.0.2=hb69a4c5_1
131+
- mpmath=1.2.1=py37h06a4308_0
132+
- munkres=1.1.4=py_0
133+
- nbclassic=0.2.6=pyhd3eb1b0_0
134+
- nbclient=0.5.3=pyhd3eb1b0_0
135+
- nbconvert=6.1.0=py37h06a4308_0
136+
- nbformat=5.1.3=pyhd3eb1b0_0
137+
- ncurses=6.3=h7f8727e_2
138+
- nest-asyncio=1.5.1=pyhd3eb1b0_0
139+
- networkx=2.6.3=pyhd3eb1b0_0
140+
- nodejs=10.13.0=he6710b0_0
141+
- notebook=6.4.6=py37h06a4308_0
142+
- numexpr=2.7.3=py37h22e1b3c_1
143+
- numpy=1.21.2=py37h20f2e39_0
144+
- numpy-base=1.21.2=py37h79a1101_0
145+
- olefile=0.46=py37_0
146+
- opencv=3.4.2=py37h6fd60c2_1
147+
- openjpeg=2.4.0=h3ad879b_0
148+
- openssl=1.1.1l=h7f8727e_0
149+
- packaging=21.3=pyhd3eb1b0_0
150+
- pandas=1.3.4=py37h8c16a72_0
151+
- pandoc=2.12=h06a4308_0
152+
- pandocfilters=1.4.3=py37h06a4308_1
153+
- parso=0.8.2=pyhd3eb1b0_0
154+
- partd=1.2.0=pyhd3eb1b0_0
155+
- pcre=8.45=h295c915_0
156+
- pexpect=4.8.0=pyhd3eb1b0_3
157+
- pickleshare=0.7.5=pyhd3eb1b0_1003
158+
- pillow=8.4.0=py37h5aabda8_0
159+
- pip=21.2.2=py37h06a4308_0
160+
- pixman=0.40.0=h7f8727e_1
161+
- prometheus_client=0.12.0=pyhd3eb1b0_0
162+
- prompt-toolkit=3.0.20=pyhd3eb1b0_0
163+
- prompt_toolkit=3.0.20=hd3eb1b0_0
164+
- ptyprocess=0.7.0=pyhd3eb1b0_2
165+
- py-opencv=3.4.2=py37hb342d67_1
166+
- pycparser=2.21=pyhd3eb1b0_0
167+
- pygments=2.10.0=pyhd3eb1b0_0
168+
- pyopenssl=21.0.0=pyhd3eb1b0_1
169+
- pyparsing=3.0.4=pyhd3eb1b0_0
170+
- pyqt=5.9.2=py37h05f1152_2
171+
- pyrsistent=0.18.0=py37heee7806_0
172+
- pysocks=1.7.1=py37_1
173+
- pytables=3.4.4=py37ha205bf6_0
174+
- python=3.7.11=h12debd9_0
175+
- python-dateutil=2.8.2=pyhd3eb1b0_0
176+
- pytz=2021.3=pyhd3eb1b0_0
177+
- pywavelets=1.1.1=py37h7b6447c_2
178+
- pyyaml=6.0=py37h7f8727e_1
179+
- pyzmq=22.3.0=py37h295c915_2
180+
- qt=5.9.7=h5867ecd_1
181+
- qtconsole=5.1.1=pyhd3eb1b0_0
182+
- qtpy=1.10.0=pyhd3eb1b0_0
183+
- readline=8.1=h27cfd23_0
184+
- requests=2.26.0=pyhd3eb1b0_0
185+
- scikit-image=0.18.3=py37h51133e4_0
186+
- scipy=1.7.1=py37h292c36d_2
187+
- send2trash=1.8.0=pyhd3eb1b0_1
188+
- setuptools=58.0.4=py37h06a4308_0
189+
- sip=4.19.8=py37hf484d3e_0
190+
- six=1.16.0=pyhd3eb1b0_0
191+
- snappy=1.1.8=he6710b0_0
192+
- sniffio=1.2.0=py37h06a4308_1
193+
- sqlite=3.36.0=hc218d9a_0
194+
- sympy=1.9=py37h06a4308_0
195+
- terminado=0.9.4=py37h06a4308_0
196+
- testpath=0.5.0=pyhd3eb1b0_0
197+
- tifffile=2021.7.2=pyhd3eb1b0_2
198+
- tk=8.6.11=h1ccaba5_0
199+
- toolz=0.11.2=pyhd3eb1b0_0
200+
- tornado=6.1=py37h27cfd23_0
201+
- traitlets=5.1.1=pyhd3eb1b0_0
202+
- typing-extensions=3.10.0.2=hd3eb1b0_0
203+
- typing_extensions=3.10.0.2=pyh06a4308_0
204+
- urllib3=1.26.7=pyhd3eb1b0_0
205+
- wcwidth=0.2.5=pyhd3eb1b0_0
206+
- webencodings=0.5.1=py37_1
207+
- wheel=0.37.0=pyhd3eb1b0_1
208+
- widgetsnbextension=3.5.1=py37_0
209+
- xarray=0.20.1=pyhd3eb1b0_1
210+
- xlrd=2.0.1=pyhd3eb1b0_0
211+
- xz=5.2.5=h7b6447c_0
212+
- yaml=0.2.5=h7b6447c_0
213+
- zeromq=4.3.4=h2531618_0
214+
- zfp=0.5.5=h2531618_6
215+
- zipp=3.6.0=pyhd3eb1b0_0
216+
- zlib=1.2.11=h7b6447c_3
217+
- zstd=1.4.9=haebb681_0
218+
prefix: /home/gjb/miniconda3/envs/scientific_python

scientific_python.pptx

10 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)