Skip to content

Commit 385a063

Browse files
authored
Update DEA Tools dependency (#147)
* Update DEA Tools dependency * Fix min bounds * Test precommit * Test precommit * Test precommit * Add precommit * Test precommit * Test precommit * Update lockfile * Test precommit * Test precommit * Make sure tests run on pyproject.toml * Automatically update integration test validation results --------- Co-authored-by: robbibt <robbibt@users.noreply.github.com>
1 parent 41ae77b commit 385a063

7 files changed

Lines changed: 246 additions & 119 deletions

File tree

.github/workflows/dea-intertidal-image.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414
- 'tests/**'
1515
- '.github/workflows/dea-intertidal-image.yml'
1616
- 'Dockerfile'
17-
- 'requirements.in'
18-
- 'setup.py'
17+
- 'pyproject.toml'
18+
- 'uv.lock'
1919
- 'codecov.yaml'
2020

2121
pull_request:
@@ -27,8 +27,8 @@ on:
2727
- 'tests/**'
2828
- '.github/workflows/dea-intertidal-image.yml'
2929
- 'Dockerfile'
30-
- 'requirements.in'
31-
- 'setup.py'
30+
- 'pyproject.toml'
31+
- 'uv.lock'
3232
- 'codecov.yaml'
3333

3434
release:
@@ -77,7 +77,7 @@ jobs:
7777
echo "PGPORT=5432" >> $GITHUB_ENV
7878
echo "PGHOST=localhost" >> $GITHUB_ENV
7979
80-
- name: Build DEA Intertidal docker image
80+
- name: Build DEA Intertidal docker image
8181
timeout-minutes: 30
8282
shell: bash
8383
run: |
@@ -122,7 +122,7 @@ jobs:
122122
with:
123123
message: |
124124
![](https://github.com/GeoscienceAustralia/dea-intertidal/blob/${{ github.head_ref }}/tests/validation.jpg?raw=true")
125-
125+
126126
For full integration test results, refer to the [Tests directory README](https://github.com/GeoscienceAustralia/dea-intertidal/tree/${{ github.head_ref }}/tests).
127127
128128
- name: Upload coverage reports to Codecov

.pre-commit-config.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: "v4.4.0"
4+
hooks:
5+
- id: check-case-conflict
6+
- id: check-merge-conflict
7+
- id: check-toml
8+
- id: check-yaml
9+
- id: end-of-file-fixer
10+
- id: trailing-whitespace
11+
12+
- repo: https://github.com/astral-sh/ruff-pre-commit
13+
rev: "v0.12.9"
14+
hooks:
15+
- id: ruff-check # Run linter using pyproject.toml config
16+
- id: ruff-format # Run formatter using pyproject.toml config
17+
18+
- repo: https://github.com/astral-sh/uv-pre-commit
19+
rev: "0.8.11"
20+
hooks:
21+
- id: uv-lock

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ requires-python = ">=3.10,<4.0"
3939
dependencies = [
4040
"Bottleneck>=1.4.2",
4141
"click>=8.1.7",
42-
"dea-tools==0.4.6.dev3", # temporarily pin specific version of DEA Tools for Numpy 2.0 compatability
42+
"dea-tools>=0.4.6",
4343
"eo-tides>=0.8.3",
4444
"folium>=0.16.0",
4545
"geopandas>=0.14.4",
@@ -83,8 +83,9 @@ dev = [
8383
"awscli>=1.38.1",
8484
"botocore>=1.37.1",
8585
"mdutils>=1.6.0",
86+
"pre-commit>=0.2.0",
8687
"pytest>=6.0.0",
87-
"pytest-dependency>=0.6.0",
88+
"pytest-dependency>=0.6.0",
8889
"pytest-cov>=6.0.0",
8990
"deptry>=0.20.0",
9091
"ruff>=0.1.0",
@@ -158,4 +159,4 @@ source = ["intertidal"]
158159
DEP002 = [
159160
"pyogrio", # used to speed up data loading
160161
"odc-ui", # ignore odc.ui not being recognised as `odc-ui`
161-
]
162+
]

tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Integration tests
1010
1111
This directory contains tests that are run to verify that DEA Intertidal code runs correctly. The ``test_intertidal.py`` file runs a small-scale full workflow analysis over an intertidal flat in the Gulf of Carpentaria using the DEA Intertidal [Command Line Interface (CLI) tools](../notebooks/Intertidal_CLI.ipynb), and compares these results against a LiDAR validation DEM to produce some simple accuracy metrics.
1212

13-
The latest integration test completed at **2025-09-24 17:19**. Compared to the previous run, it had an:
13+
The latest integration test completed at **2025-09-25 15:15**. Compared to the previous run, it had an:
1414
- RMSE accuracy of **0.14 m ( :heavy_minus_sign: no change)**
1515
- MAE accuracy of **0.12 m ( :heavy_minus_sign: no change)**
1616
- Bias of **0.12 m ( :heavy_minus_sign: no change)**

tests/validation.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,4 @@ time,Correlation,RMSE,MAE,R-squared,Bias,Regression slope
132132
2025-09-24 06:00:07.113646+00:00,0.975,0.145,0.122,0.95,0.116,1.121
133133
2025-09-24 06:17:15.044540+00:00,0.975,0.145,0.122,0.95,0.116,1.121
134134
2025-09-24 07:19:12.704574+00:00,0.975,0.145,0.122,0.95,0.116,1.121
135+
2025-09-25 05:15:37.048163+00:00,0.975,0.145,0.122,0.95,0.116,1.121

tests/validation.jpg

-121 Bytes
Loading

0 commit comments

Comments
 (0)