Merge pull request #11 from gjbex/development

Fix typos
gjbex · Dec 13, 2021 · b4b7ca0 · b4b7ca0
2 parents 453b3bd + c10354e
commit b4b7ca0
Show file tree

Hide file tree

Showing 16 changed files with 1,887 additions and 472 deletions.
diff --git a/environment.yml b/environment.yml
@@ -4,183 +4,69 @@ channels:
 dependencies:
   - _libgcc_mutex=0.1=main
   - argon2-cffi=20.1.0=py37h7b6447c_1
-  - async_generator=1.10=py37h28b3542_0
-  - attrs=20.3.0=pyhd3eb1b0_0
+  - attrs=19.3.0=py_0
   - backcall=0.2.0=py_0
   - blas=1.0=mkl
-  - bleach=3.2.1=py_0
-  - blosc=1.20.1=hd408876_0
-  - bokeh=2.2.3=py37_0
-  - brotli=1.0.9=he6710b0_2
-  - brotlipy=0.7.0=py37h27cfd23_1003
+  - bleach=3.1.5=py_0
+  - blosc=1.19.0=hd408876_0
+  - bokeh=2.1.1=py37_0
+  - brotlipy=0.7.0=py37h7b6447c_1000
   - bzip2=1.0.8=h7b6447c_0
-  - ca-certificates=2020.12.8=h06a4308_0
+  - ca-certificates=2020.6.24=0
   - cairo=1.14.12=h8948797_3
-  - certifi=2020.12.5=py37h06a4308_0
-  - cffi=1.14.0=py37h2e261b9_0
-  - chardet=3.0.4=py37h06a4308_1003
-  - charls=2.1.0=he6710b0_2
-  - cloudpickle=1.6.0=py_0
-  - cryptography=3.2.1=py37h3c74f83_1
+  - certifi=2020.6.20=py37_0
+  - cffi=1.14.1=py37he30daa8_0
+  - chardet=3.0.4=py37_1003
+  - cloudpickle=1.5.0=py_0
+  - cryptography=2.9.2=py37h1ba5d50_0
   - cycler=0.10.0=py37_0
-  - cytoolz=0.11.0=py37h7b6447c_0
-  - dask-core=2.30.0=py_0
-  - dbus=1.13.18=hb2f20db_0
+  - cytoolz=0.10.1=py37h7b6447c_0
+  - dask-core=2.22.0=py_0
+  - dbus=1.13.16=hb2f20db_0
   - decorator=4.4.2=py_0
   - defusedxml=0.6.0=py_0
   - entrypoints=0.3=py37_0
-  - expat=2.2.10=he6710b0_2
+  - expat=2.2.9=he6710b0_2
   - fastcache=1.1.0=py37h7b6447c_0
   - ffmpeg=4.0=hcdf2ecd_0
   - fontconfig=2.13.0=h9420a91_0
   - freeglut=3.0.0=hf484d3e_5
-  - freetype=2.10.4=h5ab3b9f_0
-  - giflib=5.1.4=h14c3975_1
-  - glib=2.63.1=h5a9c865_0
+  - freetype=2.10.2=h5ab3b9f_0
+  - glib=2.65.0=h3eb4bd4_0
   - gmp=6.1.2=h6c8ec71_1
   - gmpy2=2.0.8=py37h10f8cd9_2
   - graphite2=1.3.14=h23475e2_0
   - gst-plugins-base=1.14.0=hbbd80ab_1
-  - gstreamer=1.14.0=hb453b48_1
+  - gstreamer=1.14.0=hb31296c_0
   - harfbuzz=1.8.8=hffaf4a1_0
   - hdf5=1.10.2=hba1933b_1
   - icu=58.2=he6710b0_3
   - idna=2.10=py_0
-  - imagecodecs=2020.5.30=py37hfa7d478_2
   - imageio=2.9.0=py_0
-  - importlib-metadata=2.0.0=py_1
-  - importlib_metadata=2.0.0=1
-  - intel-openmp=2020.2=254
+  - importlib-metadata=1.7.0=py37_0
+  - importlib_metadata=1.7.0=0
+  - intel-openmp=2020.1=217
   - ipykernel=5.3.4=py37h5ca1d4c_0
-  - ipython=7.19.0=py37hb070fc8_0
-  - ipython_genutils=0.2.0=pyhd3eb1b0_1
-  - ipywidgets=7.5.1=py_1
+  - ipython=7.17.0=py37h39e3cac_0
+  - ipython_genutils=0.2.0=py37_0
+  - ipywidgets=7.5.1=py_0
   - jasper=2.0.14=h07fcdf6_1
-  - jedi=0.17.2=py37h06a4308_1
+  - jedi=0.15.1=py37_0
   - jinja2=2.11.2=py_0
   - jpeg=9b=h024ee3a_2
   - json5=0.9.5=py_0
-  - jsonschema=3.2.0=py_2
+  - jsonschema=3.2.0=py37_1
   - jupyter=1.0.0=py37_7
-  - jupyter_client=6.1.7=py_0
-  - jupyter_console=6.2.0=py_0
-  - jupyter_core=4.7.0=py37h06a4308_0
-  - jupyterlab=2.2.6=py_0
-  - jupyterlab_pygments=0.1.2=py_0
+  - jupyter_client=6.1.6=py_0
+  - jupyter_console=6.1.0=py_0
+  - jupyter_core=4.6.3=py37_0
+  - jupyterlab=2.1.5=py_0
   - jupyterlab_server=1.2.0=py_0
-  - jxrlib=1.1=h7b6447c_2
-  - kiwisolver=1.3.0=py37h2531618_0
+  - kiwisolver=1.2.0=py37hfd86e86_0
   - lcms2=2.11=h396b838_0
-  - libaec=1.0.4=he6710b0_1
+  - ld_impl_linux-64=2.33.1=h53a641e_7
   - libedit=3.1.20191231=h14c3975_1
-  - libffi=3.2.1=hf484d3e_1007
+  - libffi=3.3=he6710b0_2
   - libgcc-ng=9.1.0=hdf63c60_0
   - libgfortran-ng=7.3.0=hdf63c60_0
   - libglu=9.0.0=hf484d3e_1
-  - libopencv=3.4.2=hb342d67_1
-  - libopus=1.3.1=h7b6447c_0
-  - libpng=1.6.37=hbc83047_0
-  - libsodium=1.0.18=h7b6447c_0
-  - libstdcxx-ng=9.1.0=hdf63c60_0
-  - libtiff=4.1.0=h2733197_1
-  - libuuid=1.0.3=h1bed415_2
-  - libvpx=1.7.0=h439df22_0
-  - libwebp=1.0.1=h8e7db2f_0
-  - libxcb=1.14=h7b6447c_0
-  - libxml2=2.9.10=hb55368b_3
-  - libzopfli=1.0.3=he6710b0_0
-  - lz4-c=1.9.2=heb0550a_3
-  - lzo=2.10=h7b6447c_2
-  - markupsafe=1.1.1=py37h14c3975_1
-  - matplotlib=3.3.2=0
-  - matplotlib-base=3.3.2=py37h817c723_0
-  - mistune=0.8.4=py37h14c3975_1001
-  - mkl=2020.2=256
-  - mkl-service=2.3.0=py37he8ac12f_0
-  - mkl_fft=1.2.0=py37h23d657b_0
-  - mkl_random=1.1.1=py37h0573a6f_0
-  - mpc=1.1.0=h10f8cd9_1
-  - mpfr=4.0.2=hb69a4c5_1
-  - mpmath=1.1.0=py37_0
-  - nbclient=0.5.1=py_0
-  - nbconvert=6.0.7=py37_0
-  - nbformat=5.0.8=py_0
-  - ncurses=6.2=he6710b0_1
-  - nest-asyncio=1.4.3=pyhd3eb1b0_0
-  - networkx=2.5=py_0
-  - nodejs=10.13.0=he6710b0_0
-  - notebook=6.1.4=py37_0
-  - numexpr=2.7.1=py37h423224d_0
-  - numpy=1.19.2=py37h54aff64_0
-  - numpy-base=1.19.2=py37hfa32c7d_0
-  - olefile=0.46=py37_0
-  - opencv=3.4.2=py37h6fd60c2_1
-  - openjpeg=2.3.0=h05c96fa_1
-  - openssl=1.1.1i=h27cfd23_0
-  - packaging=20.7=pyhd3eb1b0_0
-  - pandas=1.1.3=py37he6710b0_0
-  - pandoc=2.11=hb0f4dca_0
-  - pandocfilters=1.4.3=py37h06a4308_1
-  - parso=0.7.0=py_0
-  - pcre=8.44=he6710b0_0
-  - pexpect=4.8.0=pyhd3eb1b0_3
-  - pickleshare=0.7.5=pyhd3eb1b0_1003
-  - pillow=8.0.1=py37he98fc37_0
-  - pip=20.3=py37h06a4308_0
-  - pixman=0.40.0=h7b6447c_0
-  - prometheus_client=0.9.0=pyhd3eb1b0_0
-  - prompt-toolkit=3.0.8=py_0
-  - prompt_toolkit=3.0.8=0
-  - ptyprocess=0.6.0=pyhd3eb1b0_2
-  - py-opencv=3.4.2=py37hb342d67_1
-  - pycparser=2.20=py_2
-  - pygments=2.7.2=pyhd3eb1b0_0
-  - pyopenssl=20.0.0=pyhd3eb1b0_1
-  - pyparsing=2.4.7=py_0
-  - pyqt=5.9.2=py37h05f1152_2
-  - pyrsistent=0.17.3=py37h7b6447c_0
-  - pysocks=1.7.1=py37_1
-  - pytables=3.4.4=py37ha205bf6_0
-  - python=3.7.5=h0371630_0
-  - python-dateutil=2.8.1=py_0
-  - pytz=2020.4=pyhd3eb1b0_0
-  - pywavelets=1.1.1=py37h7b6447c_2
-  - pyyaml=5.3.1=py37h7b6447c_1
-  - pyzmq=20.0.0=py37h2531618_1
-  - qt=5.9.7=h5867ecd_1
-  - qtconsole=4.7.7=py_0
-  - qtpy=1.9.0=py_0
-  - readline=7.0=h7b6447c_5
-  - requests=2.25.0=pyhd3eb1b0_0
-  - scikit-image=0.17.2=py37hdf5156a_0
-  - scipy=1.5.2=py37h0b6359f_0
-  - send2trash=1.5.0=py37_0
-  - setuptools=50.3.2=py37h06a4308_2
-  - sip=4.19.8=py37hf484d3e_0
-  - six=1.15.0=py37h06a4308_0
-  - snappy=1.1.8=he6710b0_0
-  - sqlite=3.33.0=h62c20be_0
-  - sympy=1.6.2=py37h06a4308_1
-  - terminado=0.9.1=py37_0
-  - testpath=0.4.4=py_0
-  - tifffile=2020.11.26=pyhd3eb1b0_0
-  - tk=8.6.10=hbc83047_0
-  - toolz=0.11.1=py_0
-  - tornado=6.1=py37h27cfd23_0
-  - traitlets=5.0.5=py_0
-  - typing_extensions=3.7.4.3=py_0
-  - urllib3=1.25.11=py_0
-  - wcwidth=0.2.5=py_0
-  - webencodings=0.5.1=py37_1
-  - wheel=0.36.0=pyhd3eb1b0_0
-  - widgetsnbextension=3.5.1=py37_0
-  - xarray=0.16.2=pyhd3eb1b0_0
-  - xlrd=1.2.0=py37_0
-  - xz=5.2.5=h7b6447c_0
-  - yaml=0.2.5=h7b6447c_0
-  - zeromq=4.3.3=he6710b0_3
-  - zipp=3.4.0=pyhd3eb1b0_0
-  - zlib=1.2.11=h7b6447c_3
-  - zstd=1.4.5=h9ceee32_0
-prefix: /home/gjb/miniconda3/envs/scientific_python
-
diff --git a/scientific_python.pptx b/scientific_python.pptx