Merge pull request #65 from digitalearthafrica/minty-fresh-training

Compatibility updates for Cape Town migration
digitalearthafrica · Jun 1, 2021 · 855c401 · 855c401
2 parents b847a6f + 2ce4f69
commit 855c401
Show file tree

Hide file tree

Showing 58 changed files with 377 additions and 1,784 deletions.
diff --git a/docs/_static/session_1/crophealth14.png b/docs/_static/session_1/crophealth14.png
diff --git a/docs/_static/session_1/crophealth18.png b/docs/_static/session_1/crophealth18.png
diff --git a/docs/_static/session_1/crophealth19.png b/docs/_static/session_1/crophealth19.png
diff --git a/docs/_static/session_1/sandbox-confirm-account.PNG b/docs/_static/session_1/sandbox-confirm-account.PNG
diff --git a/docs/_static/session_1/sandbox-confirm-account.png b/docs/_static/session_1/sandbox-confirm-account.png
diff --git a/docs/_static/session_1/sandbox-default-env.PNG b/docs/_static/session_1/sandbox-default-env.PNG
diff --git a/docs/_static/session_1/sandbox-default-env.png b/docs/_static/session_1/sandbox-default-env.png
diff --git a/docs/_static/session_1/sandbox-register-form.PNG b/docs/_static/session_1/sandbox-register-form.PNG
diff --git a/docs/_static/session_1/sandbox-register-form.png b/docs/_static/session_1/sandbox-register-form.png
diff --git a/docs/_static/session_2/04_load_data_exercise_07_imports.png b/docs/_static/session_2/04_load_data_exercise_07_imports.png
diff --git a/docs/_static/session_2/04_load_data_exercise_09_load_data.PNG b/docs/_static/session_2/04_load_data_exercise_09_load_data.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_09_load_data.png b/docs/_static/session_2/04_load_data_exercise_09_load_data.png
diff --git a/docs/_static/session_2/04_load_data_exercise_typo.PNG b/docs/_static/session_2/04_load_data_exercise_typo.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_typo.png b/docs/_static/session_2/04_load_data_exercise_typo.png
diff --git a/docs/_static/session_2/Load_data_solution.ipynb b/docs/_static/session_2/Load_data_solution.ipynb
@@ -23,18 +23,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/env/lib/python3.6/site-packages/geopandas/_compat.py:88: UserWarning: The Shapely GEOS version (3.7.2-CAPI-1.11.0 ) is incompatible with the GEOS version PyGEOS was compiled with (3.9.1-CAPI-1.14.2). Conversions between both will be slow.\n",
+      "  shapely_geos_version, geos_capi_version_string\n"
+     ]
+    }
+   ],
    "source": [
     "%matplotlib inline\n",
     "\n",
-    "import sys\n",
     "import datacube\n",
     "\n",
-    "sys.path.append(\"../Scripts\")\n",
-    "from deafrica_plotting import rgb\n",
-    "from deafrica_plotting import display_map"
+    "from deafrica_tools.plotting import rgb\n",
+    "from deafrica_tools.plotting import display_map"
    ]
   },
   {
@@ -46,9 +53,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/env/lib/python3.6/site-packages/datacube/drivers/postgres/_connections.py:87: SADeprecationWarning: Calling URL() directly is deprecated and will be disabled in a future release.  The public constructor for URL is now the URL.create() method.\n",
+      "  username=username, password=password,\n"
+     ]
+    }
+   ],
    "source": [
     "dc = datacube.Datacube(app=\"Load_data\")"
    ]
@@ -69,9 +85,23 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div style=\"width:100%;\"><div style=\"position:relative;width:100%;height:0;padding-bottom:60%;\"><iframe src=\"data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+CjxoZWFkPiAgICAKICAgIDxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04IiAvPgogICAgCiAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICAgTF9OT19UT1VDSCA9IGZhbHNlOwogICAgICAgICAgICBMX0RJU0FCTEVfM0QgPSBmYWxzZTsKICAgICAgICA8L3NjcmlwdD4KICAgIAogICAgPHN0eWxlPmh0bWwsIGJvZHkge3dpZHRoOiAxMDAlO2hlaWdodDogMTAwJTttYXJnaW46IDA7cGFkZGluZzogMDt9PC9zdHlsZT4KICAgIDxzdHlsZT4jbWFwIHtwb3NpdGlvbjphYnNvbHV0ZTt0b3A6MDtib3R0b206MDtyaWdodDowO2xlZnQ6MDt9PC9zdHlsZT4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS42LjAvZGlzdC9sZWFmbGV0LmpzIj48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2NvZGUuanF1ZXJ5LmNvbS9qcXVlcnktMS4xMi40Lm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvanMvYm9vdHN0cmFwLm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvTGVhZmxldC5hd2Vzb21lLW1hcmtlcnMvMi4wLjIvbGVhZmxldC5hd2Vzb21lLW1hcmtlcnMuanMiPjwvc2NyaXB0PgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS42LjAvZGlzdC9sZWFmbGV0LmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC8zLjIuMC9jc3MvYm9vdHN0cmFwLm1pbi5jc3MiLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvY3NzL2Jvb3RzdHJhcC10aGVtZS5taW4uY3NzIi8+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vbWF4Y2RuLmJvb3RzdHJhcGNkbi5jb20vZm9udC1hd2Vzb21lLzQuNi4zL2Nzcy9mb250LWF3ZXNvbWUubWluLmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9MZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy8yLjAuMi9sZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy5jc3MiLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9jZG4uanNkZWxpdnIubmV0L2doL3B5dGhvbi12aXN1YWxpemF0aW9uL2ZvbGl1bS9mb2xpdW0vdGVtcGxhdGVzL2xlYWZsZXQuYXdlc29tZS5yb3RhdGUubWluLmNzcyIvPgogICAgCiAgICAgICAgICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsCiAgICAgICAgICAgICAgICBpbml0aWFsLXNjYWxlPTEuMCwgbWF4aW11bS1zY2FsZT0xLjAsIHVzZXItc2NhbGFibGU9bm8iIC8+CiAgICAgICAgICAgIDxzdHlsZT4KICAgICAgICAgICAgICAgICNtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUgewogICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICAgICAgICAgICAgICAgICB3aWR0aDogMTAwLjAlOwogICAgICAgICAgICAgICAgICAgIGhlaWdodDogMTAwLjAlOwogICAgICAgICAgICAgICAgICAgIGxlZnQ6IDAuMCU7CiAgICAgICAgICAgICAgICAgICAgdG9wOiAwLjAlOwogICAgICAgICAgICAgICAgfQogICAgICAgICAgICA8L3N0eWxlPgogICAgICAgIAo8L2hlYWQ+Cjxib2R5PiAgICAKICAgIAogICAgICAgICAgICA8ZGl2IGNsYXNzPSJmb2xpdW0tbWFwIiBpZD0ibWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlIiA+PC9kaXY+CiAgICAgICAgCjwvYm9keT4KPHNjcmlwdD4gICAgCiAgICAKICAgICAgICAgICAgdmFyIG1hcF8wYTZmNzQ5ZWI4YWY0N2VjOGJmODJiMDBkOGZlYWViZSA9IEwubWFwKAogICAgICAgICAgICAgICAgIm1hcF8wYTZmNzQ5ZWI4YWY0N2VjOGJmODJiMDBkOGZlYWViZSIsCiAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgY2VudGVyOiBbLTYuOCwgMzkuMjg1XSwKICAgICAgICAgICAgICAgICAgICBjcnM6IEwuQ1JTLkVQU0czODU3LAogICAgICAgICAgICAgICAgICAgIHpvb206IDExLAogICAgICAgICAgICAgICAgICAgIHpvb21Db250cm9sOiB0cnVlLAogICAgICAgICAgICAgICAgICAgIHByZWZlckNhbnZhczogZmFsc2UsCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICk7CgogICAgICAgICAgICAKCiAgICAgICAgCiAgICAKICAgICAgICAgICAgdmFyIHRpbGVfbGF5ZXJfZmMxNWRmNGI2NjdkNDY1MmFhODkxYmQxZGI5NzlhMzggPSBMLnRpbGVMYXllcigKICAgICAgICAgICAgICAgICJodHRwOi8vbXQxLmdvb2dsZS5jb20vdnQvbHlycz15XHUwMDI2ej17en1cdTAwMjZ4PXt4fVx1MDAyNnk9e3l9IiwKICAgICAgICAgICAgICAgIHsiYXR0cmlidXRpb24iOiAiR29vZ2xlIiwgImRldGVjdFJldGluYSI6IGZhbHNlLCAibWF4TmF0aXZlWm9vbSI6IDE4LCAibWF4Wm9vbSI6IDE4LCAibWluWm9vbSI6IDAsICJub1dyYXAiOiBmYWxzZSwgIm9wYWNpdHkiOiAxLCAic3ViZG9tYWlucyI6ICJhYmMiLCAidG1zIjogZmFsc2V9CiAgICAgICAgICAgICkuYWRkVG8obWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlKTsKICAgICAgICAKICAgIAogICAgICAgICAgICB2YXIgcG9seV9saW5lXzk3ODIwZDhkZTk2YzRiNThiYTEzMjE2YjNhOWNjYmFlID0gTC5wb2x5bGluZSgKICAgICAgICAgICAgICAgIFtbLTYuOSwgMzkuMl0sIFstNi45LCAzOS4zN10sIFstNi43LCAzOS4zN10sIFstNi43LCAzOS4yXSwgWy02LjksIDM5LjJdXSwKICAgICAgICAgICAgICAgIHsiYnViYmxpbmdNb3VzZUV2ZW50cyI6IHRydWUsICJjb2xvciI6ICJyZWQiLCAiZGFzaEFycmF5IjogbnVsbCwgImRhc2hPZmZzZXQiOiBudWxsLCAiZmlsbCI6IGZhbHNlLCAiZmlsbENvbG9yIjogInJlZCIsICJmaWxsT3BhY2l0eSI6IDAuMiwgImZpbGxSdWxlIjogImV2ZW5vZGQiLCAibGluZUNhcCI6ICJyb3VuZCIsICJsaW5lSm9pbiI6ICJyb3VuZCIsICJub0NsaXAiOiBmYWxzZSwgIm9wYWNpdHkiOiAwLjgsICJzbW9vdGhGYWN0b3IiOiAxLjAsICJzdHJva2UiOiB0cnVlLCAid2VpZ2h0IjogM30KICAgICAgICAgICAgKS5hZGRUbyhtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUpOwogICAgICAgIAogICAgCiAgICAgICAgICAgICAgICB2YXIgbGF0X2xuZ19wb3B1cF83YzNjYjM3ZTFhZDY0MDVkOTY5ZmU0YTQ1NDJhMDhhYiA9IEwucG9wdXAoKTsKICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGxhdExuZ1BvcChlKSB7CiAgICAgICAgICAgICAgICAgICAgbGF0X2xuZ19wb3B1cF83YzNjYjM3ZTFhZDY0MDVkOTY5ZmU0YTQ1NDJhMDhhYgogICAgICAgICAgICAgICAgICAgICAgICAuc2V0TGF0TG5nKGUubGF0bG5nKQogICAgICAgICAgICAgICAgICAgICAgICAuc2V0Q29udGVudCgiTGF0aXR1ZGU6ICIgKyBlLmxhdGxuZy5sYXQudG9GaXhlZCg0KSArCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8YnI+TG9uZ2l0dWRlOiAiICsgZS5sYXRsbmcubG5nLnRvRml4ZWQoNCkpCiAgICAgICAgICAgICAgICAgICAgICAgIC5vcGVuT24obWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlKTsKICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICBtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUub24oJ2NsaWNrJywgbGF0TG5nUG9wKTsKICAgICAgICAgICAgCjwvc2NyaXB0Pg==\" style=\"position:absolute;width:100%;height:100%;left:0;top:0;border:none !important;\" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe></div></div>"
+      ],
+      "text/plain": [
+       "<folium.folium.Map at 0x7f78c69a1d30>"
+      ]
+     },
+     "execution_count": 3,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "x = (39.20, 39.37)\n",
     "y = (-6.90, -6.70)\n",
@@ -88,20 +118,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
     "landsat_ds = dc.load(\n",
-    "    product=\"ls8_usgs_sr_scene\",\n",
+    "    product=\"ls8_sr\",\n",
     "    x=(39.20, 39.37),\n",
     "    y=(-6.90, -6.70),\n",
     "    time=(\"2018-01-01\", \"2018-12-31\"),\n",
     "    output_crs=\"EPSG:6933\",\n",
     "    resolution=(-30, 30),\n",
     "    group_by=\"solar_day\",\n",
-    "    measurements=[\"red\", \"green\", \"blue\"]\n",
-    ")"
+    "    measurements=[\"red\", \"green\", \"blue\"])"
    ]
   },
   {
@@ -159,8 +188,7 @@
     "    output_crs=\"EPSG:6933\",\n",
     "    resolution=(-10, 10),\n",
     "    group_by=\"solar_day\",\n",
-    "    measurements=[\"red\", \"green\", \"blue\"]\n",
-    ")"
+    "    measurements=[\"red\", \"green\", \"blue\"])"
    ]
   },
   {
@@ -194,6 +222,13 @@
    "source": [
     "rgb(sentinel_2_ds, bands=[\"red\", \"green\", \"blue\"], index=9, size=10)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

diff --git a/docs/_static/session_2/explorer_11august2018.png b/docs/_static/session_2/explorer_11august2018.png
diff --git a/docs/_static/session_2/explorer_2018.PNG b/docs/_static/session_2/explorer_2018.PNG
diff --git a/docs/_static/session_2/explorer_2018.png b/docs/_static/session_2/explorer_2018.png
diff --git a/docs/_static/session_2/explorer_august.png b/docs/_static/session_2/explorer_august.png
diff --git a/docs/_static/session_2/explorer_ls8.PNG b/docs/_static/session_2/explorer_ls8.PNG
diff --git a/docs/_static/session_2/explorer_ls8.png b/docs/_static/session_2/explorer_ls8.png
diff --git a/docs/_static/session_2/explorer_tanzania.PNG b/docs/_static/session_2/explorer_tanzania.PNG
diff --git a/docs/_static/session_2/explorer_tanzania.png b/docs/_static/session_2/explorer_tanzania.png
diff --git a/docs/_static/session_2/explorer_ui1.PNG b/docs/_static/session_2/explorer_ui1.PNG
diff --git a/docs/_static/session_2/explorer_ui1.png b/docs/_static/session_2/explorer_ui1.png
diff --git a/docs/_static/session_2/explorer_zoom.PNG b/docs/_static/session_2/explorer_zoom.PNG
diff --git a/docs/_static/session_2/explorer_zoom.png b/docs/_static/session_2/explorer_zoom.png
diff --git a/docs/_static/session_3/02_cloud_masking_01_imports.png b/docs/_static/session_3/02_cloud_masking_01_imports.png
diff --git a/docs/_static/session_3/Geomedian_composite_solution.ipynb b/docs/_static/session_3/Geomedian_composite_solution.ipynb
@@ -27,16 +27,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "%matplotlib inline\n",
     "\n",
-    "import sys\n",
     "import datacube\n",
     "\n",
-    "sys.path.append(\"../Scripts\")\n",
-    "from deafrica_datahandling import load_ard\n",
-    "from deafrica_plotting import rgb\n",
-    "from deafrica_plotting import display_map\n",
+    "from deafrica_tools.datahandling import load_ard\n",
+    "from deafrica_tools.plotting import rgb\n",
+    "from deafrica_tools.plotting import display_map\n",
     "from odc.algo import xr_geomedian"
    ]
   },

diff --git a/docs/session_4/images/1-10x10.PNG → docs/_static/session_4/1-10x10.PNG b/docs/session_4/images/1-10x10.PNG → docs/_static/session_4/1-10x10.PNG
diff --git a/docs/session_4/images/2-10x10.PNG → docs/_static/session_4/2-10x10.PNG b/docs/session_4/images/2-10x10.PNG → docs/_static/session_4/2-10x10.PNG
diff --git a/docs/session_4/images/3-nonir.PNG → docs/_static/session_4/3-nonir.PNG b/docs/session_4/images/3-nonir.PNG → docs/_static/session_4/3-nonir.PNG
diff --git a/docs/session_4/images/4-nir.PNG → docs/_static/session_4/4-nir.PNG b/docs/session_4/images/4-nir.PNG → docs/_static/session_4/4-nir.PNG
diff --git a/docs/session_4/images/4-nonir.PNG → docs/_static/session_4/4-nonir.PNG b/docs/session_4/images/4-nonir.PNG → docs/_static/session_4/4-nonir.PNG
diff --git a/docs/session_4/images/4a.PNG → docs/_static/session_4/4a.PNG b/docs/session_4/images/4a.PNG → docs/_static/session_4/4a.PNG
diff --git a/docs/session_4/images/5.PNG → docs/_static/session_4/5.PNG b/docs/session_4/images/5.PNG → docs/_static/session_4/5.PNG
diff --git a/docs/session_4/images/6.PNG → docs/_static/session_4/6.PNG b/docs/session_4/images/6.PNG → docs/_static/session_4/6.PNG
diff --git a/docs/session_4/images/7.PNG → docs/_static/session_4/7.PNG b/docs/session_4/images/7.PNG → docs/_static/session_4/7.PNG
diff --git a/docs/_static/session_5/Vegetation_exercise.ipynb b/docs/_static/session_5/Vegetation_exercise.ipynb