Merge remote-tracking branch 'origin/development' into development

Author: gjbex

environment.yml

@@ -14,9 +14,9 @@ dependencies:
   - brotli=1.0.9=he6710b0_2
   - brotlipy=0.7.0=py37h27cfd23_1003
   - bzip2=1.0.8=h7b6447c_0
-  - ca-certificates=2020.10.14=0
+  - ca-certificates=2020.12.8=h06a4308_0
   - cairo=1.14.12=h8948797_3
-  - certifi=2020.11.8=py37h06a4308_0
+  - certifi=2020.12.5=py37h06a4308_0
   - cffi=1.14.0=py37h2e261b9_0
   - chardet=3.0.4=py37h06a4308_1003
   - charls=2.1.0=he6710b0_2
@@ -116,7 +116,7 @@ dependencies:
   - olefile=0.46=py37_0
   - opencv=3.4.2=py37h6fd60c2_1
   - openjpeg=2.3.0=h05c96fa_1
-  - openssl=1.1.1h=h7b6447c_0
+  - openssl=1.1.1i=h27cfd23_0
   - packaging=20.7=pyhd3eb1b0_0
   - pandas=1.1.3=py37he6710b0_0
   - pandoc=2.11=hb0f4dca_0
@@ -174,6 +174,7 @@ dependencies:
   - 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

scientific_python_linux64_conda_specs.txt

@@ -4,7 +4,7 @@
 @EXPLICIT
 https://repo.anaconda.com/pkgs/main/linux-64/_libgcc_mutex-0.1-main.conda
 https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-mkl.conda
-https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2020.10.14-0.conda
+https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2020.12.8-h06a4308_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/intel-openmp-2020.2-254.conda
 https://repo.anaconda.com/pkgs/main/linux-64/libgfortran-ng-7.3.0-hdf63c60_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-9.1.0-hdf63c60_0.conda
@@ -35,7 +35,7 @@ https://repo.anaconda.com/pkgs/main/linux-64/lz4-c-1.9.2-heb0550a_3.conda
 https://repo.anaconda.com/pkgs/main/linux-64/lzo-2.10-h7b6447c_2.conda
 https://repo.anaconda.com/pkgs/main/linux-64/ncurses-6.2-he6710b0_1.conda
 https://repo.anaconda.com/pkgs/main/linux-64/nodejs-10.13.0-he6710b0_0.conda
-https://repo.anaconda.com/pkgs/main/linux-64/openssl-1.1.1h-h7b6447c_0.conda
+https://repo.anaconda.com/pkgs/main/linux-64/openssl-1.1.1i-h27cfd23_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/pcre-8.44-he6710b0_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/pixman-0.40.0-h7b6447c_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/snappy-1.1.8-he6710b0_0.conda
@@ -71,7 +71,7 @@ https://repo.anaconda.com/pkgs/main/linux-64/async_generator-1.10-py37h28b3542_0
 https://repo.anaconda.com/pkgs/main/noarch/attrs-20.3.0-pyhd3eb1b0_0.conda
 https://repo.anaconda.com/pkgs/main/noarch/backcall-0.2.0-py_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/cairo-1.14.12-h8948797_3.conda
-https://repo.anaconda.com/pkgs/main/linux-64/certifi-2020.11.8-py37h06a4308_0.conda
+https://repo.anaconda.com/pkgs/main/linux-64/certifi-2020.12.5-py37h06a4308_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/chardet-3.0.4-py37h06a4308_1003.conda
 https://repo.anaconda.com/pkgs/main/noarch/cloudpickle-1.6.0-py_0.conda
 https://repo.anaconda.com/pkgs/main/noarch/decorator-4.4.2-py_0.conda
@@ -181,3 +181,4 @@ https://repo.anaconda.com/pkgs/main/noarch/tifffile-2020.11.26-pyhd3eb1b0_0.cond
 https://repo.anaconda.com/pkgs/main/linux-64/opencv-3.4.2-py37h6fd60c2_1.conda
 https://repo.anaconda.com/pkgs/main/linux-64/pytables-3.4.4-py37ha205bf6_0.conda
 https://repo.anaconda.com/pkgs/main/linux-64/scikit-image-0.17.2-py37hdf5156a_0.conda
+https://repo.anaconda.com/pkgs/main/noarch/xarray-0.16.2-pyhd3eb1b0_0.conda

source-code/README.md

@@ -34,3 +34,5 @@ to create it.  There is some material not covered in the presentation as well.
 * [`matrices`](matrices): some numpy illustrations.
 * [`numpy`](numpy): some numpy and scipy illustrations.
 * [`sympy`](sympy): some illustrations of doing symbolic computations using sympy.
+* [`xarray`](xarray): introduction to `xarray`, a library for indexed, labeled
+  N-dimensional arrays.

source-code/bokeh/pendulum.ipynb

@@ -0,0 +1 @@
+*.nc

source-code/xarray/.gitignore

@@ -0,0 +1,8 @@
+# Xarray
+
+xarray is a Python package to represent numerical data with metadata.  In that respect it is
+a hybrid between numpy and pandas.
+
+## What is it?
+
+1. `xarray_intro.ipynb`: Jupyter notebook introducing some of xarray's features.