changed to most recent odc-apps-dc-tools version

eo2cube · Jul 20, 2021 · 7cd1c99 · 7cd1c99
1 parent adecfc2
commit 7cd1c99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/docker_init b/docker_init
@@ -1,3 +1,3 @@
 docker-compose exec jupyter datacube -v system init
 docker-compose exec jupyter datacube product add https://raw.githubusercontent.com/digitalearthafrica/config/master/products/esa_s2_l2a.odc-product.yaml
-docker-compose exec jupyter bash -c "stac-to-dc --bbox='25,20,35,30' --collections='sentinel-s2-l2a-cogs' --datetime='2020-01-01/2020-03-31' s2_l2a"
+docker-compose exec jupyter bash -c "stac-to-dc --bbox='25,20,35,30' --collections='sentinel-s2-l2a-cogs' --datetime='2020-01-01/2020-03-31'"
diff --git a/notebooks/r_s2_odc_example.ipynb b/notebooks/r_s2_odc_example.ipynb
@@ -44,7 +44,7 @@
     }
    ],
    "source": [
-    "devtools::install_github(\"eo2cube/odcr\")\n",
+    "devtools::install_github(\"eo2cube/odcr\", dependencies = TRUE)\n",
     "library(odcr)"
    ]
   },
@@ -94,7 +94,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "id": "a5ad758b",
    "metadata": {},
    "outputs": [],
@@ -114,7 +114,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "id": "5d882ba1",
    "metadata": {},
    "outputs": [
@@ -237,7 +237,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "id": "50921ff4",
    "metadata": {},
    "outputs": [
@@ -247,7 +247,7 @@
        "<table class=\"dataframe\">\n",
        "<caption>A data.frame: 1 × 17</caption>\n",
        "<thead>\n",
-       "\t<tr><th></th><th scope=col>name</th><th scope=col>description</th><th scope=col>time</th><th scope=col>label</th><th scope=col>product_family</th><th scope=col>instrument</th><th scope=col>platform</th><th scope=col>lon</th><th scope=col>dataset_maturity</th><th scope=col>format</th><th scope=col>lat</th><th scope=col>region_code</th><th scope=col>creation_time</th><th scope=col>crs</th><th scope=col>resolution</th><th scope=col>tile_size</th><th scope=col>spatial_dimensions</th></tr>\n",
+       "\t<tr><th></th><th scope=col>name</th><th scope=col>description</th><th scope=col>creation_time</th><th scope=col>time</th><th scope=col>region_code</th><th scope=col>format</th><th scope=col>instrument</th><th scope=col>dataset_maturity</th><th scope=col>platform</th><th scope=col>lon</th><th scope=col>label</th><th scope=col>lat</th><th scope=col>product_family</th><th scope=col>crs</th><th scope=col>resolution</th><th scope=col>tile_size</th><th scope=col>spatial_dimensions</th></tr>\n",
        "\t<tr><th></th><th scope=col>&lt;chr&gt;</th><th scope=col>&lt;chr&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;list&gt;</th><th scope=col>&lt;dbl&gt;</th><th scope=col>&lt;dbl&gt;</th><th scope=col>&lt;dbl&gt;</th><th scope=col>&lt;dbl&gt;</th></tr>\n",
        "</thead>\n",
        "<tbody>\n",
@@ -258,7 +258,7 @@
       "text/latex": [
        "A data.frame: 1 × 17\n",
        "\\begin{tabular}{r|lllllllllllllllll}\n",
-       "  & name & description & time & label & product\\_family & instrument & platform & lon & dataset\\_maturity & format & lat & region\\_code & creation\\_time & crs & resolution & tile\\_size & spatial\\_dimensions\\\\\n",
+       "  & name & description & creation\\_time & time & region\\_code & format & instrument & dataset\\_maturity & platform & lon & label & lat & product\\_family & crs & resolution & tile\\_size & spatial\\_dimensions\\\\\n",
        "  & <chr> & <chr> & <list> & <list> & <list> & <list> & <list> & <list> & <list> & <list> & <list> & <list> & <list> & <dbl> & <dbl> & <dbl> & <dbl>\\\\\n",
        "\\hline\n",
        "\t1 & s2\\_l2a & Sentinel-2a and Sentinel-2b imagery, processed to Level 2A (Surface Reflectance) and converted to Cloud Optimized GeoTIFFs & NULL & NULL & NULL & NULL & NULL & NULL & NULL & NULL & NULL & NULL & NULL & NaN & NaN & NaN & NaN\\\\\n",
@@ -268,7 +268,7 @@
        "\n",
        "A data.frame: 1 × 17\n",
        "\n",
-       "| <!--/--> | name &lt;chr&gt; | description &lt;chr&gt; | time &lt;list&gt; | label &lt;list&gt; | product_family &lt;list&gt; | instrument &lt;list&gt; | platform &lt;list&gt; | lon &lt;list&gt; | dataset_maturity &lt;list&gt; | format &lt;list&gt; | lat &lt;list&gt; | region_code &lt;list&gt; | creation_time &lt;list&gt; | crs &lt;dbl&gt; | resolution &lt;dbl&gt; | tile_size &lt;dbl&gt; | spatial_dimensions &lt;dbl&gt; |\n",
+       "| <!--/--> | name &lt;chr&gt; | description &lt;chr&gt; | creation_time &lt;list&gt; | time &lt;list&gt; | region_code &lt;list&gt; | format &lt;list&gt; | instrument &lt;list&gt; | dataset_maturity &lt;list&gt; | platform &lt;list&gt; | lon &lt;list&gt; | label &lt;list&gt; | lat &lt;list&gt; | product_family &lt;list&gt; | crs &lt;dbl&gt; | resolution &lt;dbl&gt; | tile_size &lt;dbl&gt; | spatial_dimensions &lt;dbl&gt; |\n",
        "|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|\n",
        "| 1 | s2_l2a | Sentinel-2a and Sentinel-2b imagery, processed to Level 2A (Surface Reflectance) and converted to Cloud Optimized GeoTIFFs | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NaN | NaN | NaN | NaN |\n",
        "\n"
@@ -278,10 +278,10 @@
        "1 s2_l2a\n",
        "  description                                                                                                               \n",
        "1 Sentinel-2a and Sentinel-2b imagery, processed to Level 2A (Surface Reflectance) and converted to Cloud Optimized GeoTIFFs\n",
-       "  time label product_family instrument platform lon  dataset_maturity format\n",
-       "1 NULL NULL  NULL           NULL       NULL     NULL NULL             NULL  \n",
-       "  lat  region_code creation_time crs resolution tile_size spatial_dimensions\n",
-       "1 NULL NULL        NULL          NaN NaN        NaN       NaN               "
+       "  creation_time time region_code format instrument dataset_maturity platform\n",
+       "1 NULL          NULL NULL        NULL   NULL       NULL             NULL    \n",
+       "  lon  label lat  product_family crs resolution tile_size spatial_dimensions\n",
+       "1 NULL NULL  NULL NULL           NaN NaN        NaN       NaN               "
       ]
      },
      "metadata": {},

diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ odc-algo
 odc-aws
 odc-aio
 odc-apps-cloud
-odc-apps-dc-tools==0.1.dev1024+g921bd72
+odc-apps-dc-tools
 odc-ui
 odc-index
 # Pinned for Alex to index STAC.