diff --git a/environments/conda/isc-environment.yml b/environments/conda/isc-environment.yml index f0231fd..8db5ec7 100644 --- a/environments/conda/isc-environment.yml +++ b/environments/conda/isc-environment.yml @@ -3,118 +3,18 @@ channels: - conda-forge - defaults dependencies: - - asn1crypto=0.24.0=py37_1003 - - basemap=1.2.0=py37h50ae964_0 - - bokeh=0.13.0=py37_0 - - ca-certificates=2018.8.24=ha4d7672_0 - - cartopy=0.16.0=py37h81b52dc_2 - - certifi=2018.8.24=py37_1001 - - cf_units=2.0.1=py37h7eb728f_2 - - cffi=1.11.5=py37h5e8e0c9_1 - - chardet=3.0.4=py37_1003 - - click=7.0=py_0 - - cloudpickle=0.5.6=py_0 - - cryptography=2.3.1=py37hdffb7b8_0 - - cytoolz=0.9.0.1=py37h470a237_1 - - dask=0.19.3=py_0 - - dask-core=0.19.3=py_0 - - distributed=1.23.3=py37_1000 - - geos=3.6.2=hfc679d8_3 - - heapdict=1.0.0=py37_1000 - - idna=2.7=py37_1002 - - iris=2.1.0=py37_4 - - jinja2=2.10=py_1 - - libtiff=4.0.9=he6b73bb_1 - - libxslt=1.1.32=h88dbc4e_2 - - locket=0.2.0=py_2 - - lxml=4.2.5=py37hc9114bc_0 - - markupsafe=1.0=py37h470a237_1 - - msgpack-python=0.5.6=py37h2d50403_3 - - olefile=0.46=py_0 - - openssl=1.0.2p=h470a237_0 - - owslib=0.17.0=py_0 - - packaging=18.0=py_0 - - pandas=0.23.4=py37hf8a1672_0 - - partd=0.3.8=py_1 - - proj4=4.9.3=h470a237_8 - - psutil=5.4.7=py37h470a237_1 - - pycparser=2.19=py_0 - - pyepsg=0.3.2=py_1 - - pyke=1.1.1=py37_1000 - - pyopenssl=18.0.0=py37_0 - - pyproj=1.9.5.1=py37h508ed2a_5 - - pysocks=1.6.8=py37_1002 - - pyyaml=3.13=py37h470a237_1 - - requests=2.19.1=py37_1 - - setuptools=40.4.3=py37_0 - - shapely=1.6.4=py37h164cb2d_0 - - six=1.11.0=py37_1 - - sortedcontainers=2.0.5=py_0 - - tblib=1.3.2=py_1 - - toolz=0.9.0=py_1 - - udunits2=2.2.27.6=h3a4f0e9_1 - - urllib3=1.23=py37_1 - - yaml=0.1.7=h470a237_1 - - zict=0.1.3=py_0 - - blas=1.0=mkl - - bzip2=1.0.6=h14c3975_5 - - cftime=1.0.0b1=py37h035aef0_0 - - curl=7.61.1=hbc83047_0 - - cycler=0.10.0=py37_0 - - dbus=1.13.2=h714fa37_1 - - expat=2.2.6=he6710b0_0 - - fontconfig=2.13.0=h9420a91_0 - - freetype=2.9.1=h8a8886c_1 - - glib=2.56.2=hd408876_0 - - gst-plugins-base=1.14.0=hbbd80ab_1 - - gstreamer=1.14.0=hb453b48_1 - - hdf4=4.2.13=h3ca952b_2 - - hdf5=1.10.2=hba1933b_1 - - icu=58.2=h9c2bf20_1 - - intel-openmp=2019.0=118 - - jpeg=9b=h024ee3a_2 - - kiwisolver=1.0.1=py37hf484d3e_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20170329=h6b74fdf_2 - - libffi=3.2.1=hd88cf55_4 - - libgcc-ng=8.2.0=hdf63c60_1 - - libgfortran-ng=7.3.0=hdf63c60_0 - - libnetcdf=4.6.1=h10edf3e_1 - - libpng=1.6.34=hb9fc6fc_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=8.2.0=hdf63c60_1 - - libuuid=1.0.3=h1bed415_2 - - libxcb=1.13=h1bed415_1 - - libxml2=2.9.8=h26e45fe_1 - - matplotlib=3.0.0=py37h5429711_0 - - mkl=2019.0=118 - - mkl_fft=1.0.6=py37h7dd41cf_0 - - mkl_random=1.0.1=py37h4414c95_1 - - ncurses=6.1=hf484d3e_0 - - netcdf4=1.4.1=py37h4b4f87f_0 - - numpy=1.15.2=py37h1d66e8a_1 - - numpy-base=1.15.2=py37h81de0dd_1 - - pcre=8.42=h439df22_0 - - pillow=5.3.0=py37h34e0f95_0 - - pip=10.0.1=py37_0 - - pyparsing=2.2.1=py37_0 - - pyqt=5.9.2=py37h05f1152_2 - - pyserial=3.4=py37_0 - - pyshp=1.2.12=py37_0 - - python=3.7.0=hc3d631a_0 - - python-dateutil=2.7.3=py37_0 - - pytz=2018.5=py37_0 - - qt=5.9.6=h8703b6f_2 - - readline=7.0=h7b6447c_5 - - scipy=1.1.0=py37hfa4b5c9_1 - - sip=4.19.8=py37hf484d3e_0 - - sqlite=3.25.2=h7b6447c_0 - - tk=8.6.8=hbc83047_0 - - tornado=5.1.1=py37h7b6447c_0 - - wheel=0.32.0=py37_0 - - xz=5.2.4=h14c3975_4 - - zlib=1.2.11=ha838bed_2 + - basemap + - cf_units + - iris + - matplotlib + - netcdf4 + - numpy + - numpy-base + - pip + - pyserial + - pyshp + - python=3.7 - pip: - - msgpack==0.5.6 + - msgpack + - scitools-iris prefix: /home/vagrant/miniconda3/envs/isc - diff --git a/python/exercises/numpy_exercises_solutions.docx b/python/exercises/numpy_exercises_solutions.docx index c0aef3e..97776a5 100644 Binary files a/python/exercises/numpy_exercises_solutions.docx and b/python/exercises/numpy_exercises_solutions.docx differ diff --git a/python/exercises/numpy_exercises_solutions.pdf b/python/exercises/numpy_exercises_solutions.pdf index 7f06847..0e8b077 100644 Binary files a/python/exercises/numpy_exercises_solutions.pdf and b/python/exercises/numpy_exercises_solutions.pdf differ diff --git a/python/exercises/python_exercises_solutions.docx b/python/exercises/python_exercises_solutions.docx index 7dccc3a..bf55dcd 100644 Binary files a/python/exercises/python_exercises_solutions.docx and b/python/exercises/python_exercises_solutions.docx differ diff --git a/python/exercises/python_exercises_solutions.pdf b/python/exercises/python_exercises_solutions.pdf index 0f49bc3..2512f7a 100644 Binary files a/python/exercises/python_exercises_solutions.pdf and b/python/exercises/python_exercises_solutions.pdf differ diff --git a/python/presentations/handling_arrays/numpy.pdf b/python/presentations/handling_arrays/numpy.pdf index 0e14f23..18638ee 100644 Binary files a/python/presentations/handling_arrays/numpy.pdf and b/python/presentations/handling_arrays/numpy.pdf differ diff --git a/python/presentations/handling_arrays/numpy.pptx b/python/presentations/handling_arrays/numpy.pptx index 6e49d75..588f959 100644 Binary files a/python/presentations/handling_arrays/numpy.pptx and b/python/presentations/handling_arrays/numpy.pptx differ diff --git a/python/presentations/learning_python/05_flow.pdf b/python/presentations/learning_python/05_flow.pdf index ec407d7..dab6099 100644 Binary files a/python/presentations/learning_python/05_flow.pdf and b/python/presentations/learning_python/05_flow.pdf differ diff --git a/python/presentations/learning_python/05_flow.pptx b/python/presentations/learning_python/05_flow.pptx index 4cf844c..8ef58c3 100644 Binary files a/python/presentations/learning_python/05_flow.pptx and b/python/presentations/learning_python/05_flow.pptx differ diff --git a/python/presentations/learning_python/08_slice.pdf b/python/presentations/learning_python/08_slice.pdf index 01d3146..6ec0201 100644 Binary files a/python/presentations/learning_python/08_slice.pdf and b/python/presentations/learning_python/08_slice.pdf differ diff --git a/python/presentations/learning_python/08_slice.pptx b/python/presentations/learning_python/08_slice.pptx index 3f3fa4c..ccf5920 100644 Binary files a/python/presentations/learning_python/08_slice.pptx and b/python/presentations/learning_python/08_slice.pptx differ diff --git a/python/presentations/learning_python/09_list_comprehensions.pdf b/python/presentations/learning_python/09_list_comprehensions.pdf index 5f61696..e123a71 100644 Binary files a/python/presentations/learning_python/09_list_comprehensions.pdf and b/python/presentations/learning_python/09_list_comprehensions.pdf differ diff --git a/python/presentations/learning_python/09_list_comprehensions.pptx b/python/presentations/learning_python/09_list_comprehensions.pptx index bd6c792..6ca88bc 100644 Binary files a/python/presentations/learning_python/09_list_comprehensions.pptx and b/python/presentations/learning_python/09_list_comprehensions.pptx differ diff --git a/python/presentations/learning_python/11_io.pdf b/python/presentations/learning_python/11_io.pdf index eb55505..07c2d5c 100644 Binary files a/python/presentations/learning_python/11_io.pdf and b/python/presentations/learning_python/11_io.pdf differ diff --git a/python/presentations/learning_python/11_io.pptx b/python/presentations/learning_python/11_io.pptx index 3a6b2ac..c28ba36 100644 Binary files a/python/presentations/learning_python/11_io.pptx and b/python/presentations/learning_python/11_io.pptx differ diff --git a/python/presentations/learning_python/12_strings.pdf b/python/presentations/learning_python/12_strings.pdf index b900a15..ac208e4 100644 Binary files a/python/presentations/learning_python/12_strings.pdf and b/python/presentations/learning_python/12_strings.pdf differ diff --git a/python/presentations/learning_python/12_strings.pptx b/python/presentations/learning_python/12_strings.pptx index ef0d4f1..c99d811 100644 Binary files a/python/presentations/learning_python/12_strings.pptx and b/python/presentations/learning_python/12_strings.pptx differ diff --git a/python/presentations/learning_python/14_func.pdf b/python/presentations/learning_python/14_func.pdf index 42a9000..bb156e5 100644 Binary files a/python/presentations/learning_python/14_func.pdf and b/python/presentations/learning_python/14_func.pdf differ diff --git a/python/presentations/learning_python/14_func.pptx b/python/presentations/learning_python/14_func.pptx index e8d4000..7cb1aa9 100644 Binary files a/python/presentations/learning_python/14_func.pptx and b/python/presentations/learning_python/14_func.pptx differ diff --git a/python/presentations/learning_python/16_lib.pdf b/python/presentations/learning_python/16_lib.pdf index 6b36a00..69a143a 100644 Binary files a/python/presentations/learning_python/16_lib.pdf and b/python/presentations/learning_python/16_lib.pdf differ diff --git a/python/presentations/learning_python/16_lib.pptx b/python/presentations/learning_python/16_lib.pptx index 70b862f..4be47c5 100644 Binary files a/python/presentations/learning_python/16_lib.pptx and b/python/presentations/learning_python/16_lib.pptx differ diff --git a/python/presentations/learning_python/18_ceda-sets.pdf b/python/presentations/learning_python/18_ceda-sets.pdf index 641ca7c..64310c2 100644 Binary files a/python/presentations/learning_python/18_ceda-sets.pdf and b/python/presentations/learning_python/18_ceda-sets.pdf differ diff --git a/python/presentations/learning_python/18_ceda-sets.pptx b/python/presentations/learning_python/18_ceda-sets.pptx index f231572..63ad393 100644 Binary files a/python/presentations/learning_python/18_ceda-sets.pptx and b/python/presentations/learning_python/18_ceda-sets.pptx differ diff --git a/python/presentations/learning_python/19_ceda-dict.pdf b/python/presentations/learning_python/19_ceda-dict.pdf index 8b27af0..a5f1095 100755 Binary files a/python/presentations/learning_python/19_ceda-dict.pdf and b/python/presentations/learning_python/19_ceda-dict.pdf differ diff --git a/python/presentations/learning_python/19_ceda-dict.pptx b/python/presentations/learning_python/19_ceda-dict.pptx index 84b94c1..3f356e1 100755 Binary files a/python/presentations/learning_python/19_ceda-dict.pptx and b/python/presentations/learning_python/19_ceda-dict.pptx differ diff --git a/python/presentations/learning_python/20_ceda-error.pdf b/python/presentations/learning_python/20_ceda-error.pdf index 938aff6..fa1048e 100644 Binary files a/python/presentations/learning_python/20_ceda-error.pdf and b/python/presentations/learning_python/20_ceda-error.pdf differ diff --git a/python/presentations/learning_python/20_ceda-error.pptx b/python/presentations/learning_python/20_ceda-error.pptx index 12e2460..722d239 100644 Binary files a/python/presentations/learning_python/20_ceda-error.pptx and b/python/presentations/learning_python/20_ceda-error.pptx differ diff --git a/python/presentations/learning_python/21_ceda-log-pdb.pdf b/python/presentations/learning_python/21_ceda-log-pdb.pdf index edd4013..37b0431 100644 Binary files a/python/presentations/learning_python/21_ceda-log-pdb.pdf and b/python/presentations/learning_python/21_ceda-log-pdb.pdf differ diff --git a/python/presentations/learning_python/21_ceda-log-pdb.pptx b/python/presentations/learning_python/21_ceda-log-pdb.pptx index e403290..39fd6d9 100644 Binary files a/python/presentations/learning_python/21_ceda-log-pdb.pptx and b/python/presentations/learning_python/21_ceda-log-pdb.pptx differ diff --git a/python/presentations/learning_python/22_ceda-oop.pdf b/python/presentations/learning_python/22_ceda-oop.pdf index 313235d..14941d4 100644 Binary files a/python/presentations/learning_python/22_ceda-oop.pdf and b/python/presentations/learning_python/22_ceda-oop.pdf differ diff --git a/python/presentations/learning_python/22_ceda-oop.pptx b/python/presentations/learning_python/22_ceda-oop.pptx index 0fab011..a883ab8 100644 Binary files a/python/presentations/learning_python/22_ceda-oop.pptx and b/python/presentations/learning_python/22_ceda-oop.pptx differ diff --git a/python/presentations/learning_python/24_ceda-py-summary.pdf b/python/presentations/learning_python/24_ceda-py-summary.pdf index fdd02fb..f9f9191 100644 Binary files a/python/presentations/learning_python/24_ceda-py-summary.pdf and b/python/presentations/learning_python/24_ceda-py-summary.pdf differ diff --git a/python/presentations/learning_python/24_ceda-py-summary.pptx b/python/presentations/learning_python/24_ceda-py-summary.pptx index 47a10e1..ad8127c 100644 Binary files a/python/presentations/learning_python/24_ceda-py-summary.pptx and b/python/presentations/learning_python/24_ceda-py-summary.pptx differ diff --git a/shell/exercises/shell_exercises_and_solutions.docx b/shell/exercises/shell_exercises_and_solutions.docx index 7cedd65..f01eee3 100644 Binary files a/shell/exercises/shell_exercises_and_solutions.docx and b/shell/exercises/shell_exercises_and_solutions.docx differ diff --git a/shell/exercises/shell_exercises_and_solutions.pdf b/shell/exercises/shell_exercises_and_solutions.pdf index cfeacdc..15b502d 100644 Binary files a/shell/exercises/shell_exercises_and_solutions.pdf and b/shell/exercises/shell_exercises_and_solutions.pdf differ