Skip to content

Commit

Permalink
Merge pull request #1185 from GeoscienceAustralia/develop
Browse files Browse the repository at this point in the history
Merge 'develop' into 'stable'
  • Loading branch information
robbibt authored Feb 15, 2024
2 parents b911735 + f79944b commit ca20a30
Show file tree
Hide file tree
Showing 21 changed files with 78 additions and 335 deletions.
8 changes: 5 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ Include a brief description of the changes being proposed, and why they are nece

### Closes issues (optional)
- Closes Issue #000
- Closes Issue #000

### Checklist (replace `[ ]` with `[x]` to check off)
### Checklist
(Replace `[ ]` with `[x]` to check off)

- [ ] Notebook created using the [DEA-notebooks template](https://github.com/GeoscienceAustralia/dea-notebooks/tree/develop)
- [ ] Remove any unused Python packages from `Load packages`
- [ ] Remove any unused/empty code cells
Expand All @@ -15,5 +16,6 @@ Include a brief description of the changes being proposed, and why they are nece
- [ ] Clear all outputs, run notebook from start to finish, and save the notebook in the state where all cells have been sequentially evaluated
- [ ] Test notebook on both the `NCI` and `DEA Sandbox` (flag if not working as part of PR and ask for help to solve if needed)
- [ ] If applicable, update the `Notebook currently compatible with the NCI|DEA Sandbox environment only` line below the notebook title to reflect the environments the notebook is compatible with
- [ ] Check for any spelling mistakes using the DEA Sandbox's built-in spellchecker (double click on markdown cells then right-click on pink highlighted words). For example:


![sandbox_spellchecker](https://github.com/GeoscienceAustralia/dea-notebooks/assets/17680388/c5e5848b-fd54-4eb5-aae9-29838761f2af)
19 changes: 0 additions & 19 deletions .github/workflows/configs/spellcheck_config.yaml

This file was deleted.

216 changes: 0 additions & 216 deletions .github/workflows/configs/spellcheck_wordlist.txt

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/spellcheck.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/test_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ jobs:
aws-region: ap-southeast-2

- name: Copy tide modelling files with the AWS CLI
run: aws s3 sync s3://dea-non-public-data/tide_models/tide_models tide_models
run: |
aws s3 sync s3://dea-non-public-data/tide_models/tide_models/fes2014 tide_models/fes2014
aws s3 sync s3://dea-non-public-data/tide_models/tide_models/hamtide tide_models/hamtide
- name: Login to Amazon ECR Private
id: login-ecr
Expand Down
2 changes: 0 additions & 2 deletions Beginners_guide/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ The Beginners Guide contains introductory notebooks aimed at introducing Jupyter

.. toctree::
:maxdepth: 1
:caption: Beginner's Guide

01_Jupyter_notebooks.ipynb
02_DEA.ipynb
Expand All @@ -25,7 +24,6 @@ Once you have you have completed the beginner tutorials, join advanced users in

.. toctree::
:maxdepth: 2
:caption: Guided Tutorial

Guided_tutorial.ipynb

Expand Down
2 changes: 1 addition & 1 deletion DEA_products/DEA_Wetlands_Insight_Tool.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"\n",
"## Related products\n",
"* [DEA Fractional Cover (Landsat)](../DEA_products/DEA_Fractional_Cover.ipynb)\n",
"* [DEA Tasseled Cap Indices Percentiles Calendar Year (Landsat)](https://docs.dea.ga.gov.au/data/product/dea-wetness-percentiles-landsat)\n",
"* [DEA Tasseled Cap Indices Percentiles Calendar Year (Landsat)](https://docs.dea.ga.gov.au/data/product/dea-tasseled-cap-percentiles-landsat/)\n",
"* [DEA Water Observations (Landsat)](../DEA_products/DEA_Water_Observations.ipynb)"
]
},
Expand Down
1 change: 0 additions & 1 deletion DEA_products/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Notebooks introducing DEA's satellite datasets and derived products, including h

.. toctree::
:maxdepth: 1
:caption: DEA products

DEA_Landsat_Surface_Reflectance.ipynb
DEA_Sentinel2_Surface_Reflectance.ipynb
Expand Down
1 change: 0 additions & 1 deletion How_to_guides/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ A recipe book of simple code examples demonstrating how to perform common geospa

.. toctree::
:maxdepth: 1
:caption: How to guides

Analyse_multiple_polygons.ipynb
Animated_timeseries.ipynb
Expand Down
3 changes: 2 additions & 1 deletion How_to_guides/Reprojecting_data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
"Now we have loaded our raster dataset, we can inspect its `GeoBox` object that we will use to allow us to reproject data.\n",
"The `GeoBox` can be accessed using the `.geobox` method.\n",
"It includes a set of information that together completely define the spatial grid of our data:\n",
"\n",
"* The width (e.g. `95`) and height (e.g. `90`) of our data in pixels\n",
"* An `Affine` object which defines the spatial resolution (e.g. `-0.0020751667555555255` and `0.0020769114631576106`) and spatial position (e.g. `149.036528545` and `-35.198132594`) of our data\n",
"* The coordinate reference system of our data (e.g. `+init=epsg:4326`)\n"
Expand Down Expand Up @@ -779,7 +780,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
"version": "3.10.13"
},
"widgets": {
"application/vnd.jupyter.widget-state+json": {
Expand Down
4 changes: 2 additions & 2 deletions Interactive_apps/Generating_satellite_animations.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
Expand Down Expand Up @@ -130,6 +129,7 @@
"\n",
"The animation tool supports several advanced features. \n",
"To access these, click on the `Advanced` tab in the menu to the left of the map to expand it:\n",
"\n",
"* `Frame interval`: The frame rate used to animate the satellite data. \n",
"Values are in milliseconds - larger values will produce a longer, slower animation.\n",
"* `Resolution`: The spatial resolution to load data (in metres). By default, the tool will automatically set the best possible resolution depending on the satellites selected (i.e. 30 m for Landsat, 10 m for Sentinel-2). \n",
Expand Down Expand Up @@ -251,7 +251,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
"version": "3.10.13"
},
"widgets": {
"application/vnd.jupyter.widget-state+json": {
Expand Down
1 change: 0 additions & 1 deletion Interactive_apps/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Interactive widgets and apps that require little or no coding to run

.. toctree::
:maxdepth: 1
:caption: Interactive apps

Change_filmstrips.ipynb
Coastal_transects.ipynb
Expand Down
Loading

0 comments on commit ca20a30

Please sign in to comment.