Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DB_NAME=soil_id
DB_HOST=0.0.0.0
DB_USERNAME=postgres
DB_PASSWORD=postgres
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ default_install_hook_types:

repos:
- repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update
rev: v0.8.0
rev: v0.9.0
hooks:
- id: pre-commit-update

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.0
rev: v0.14.6
hooks:
- id: ruff-check
args: [--fix]
- id: ruff-format

- repo: https://github.com/compilerla/conventional-pre-commit
rev: v4.2.0
rev: v4.3.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ clean:

test: clean check_rebuild
if [ -z "$(PATTERN)" ]; then \
$(DC_RUN_CMD) pytest soil_id -vv; \
pytest soil_id -vv; \
else \
$(DC_RUN_CMD) pytest soil_id -vv -k "$(PATTERN)"; \
pytest soil_id -vv -k "$(PATTERN)"; \
fi

test_update_snapshots: clean check_rebuild
if [ -z "$(PATTERN)" ]; then \
$(DC_RUN_CMD) pytest soil_id --snapshot-update; \
pytest soil_id --snapshot-update; \
else \
$(DC_RUN_CMD) pytest soil_id --snapshot-update -k "$(PATTERN)"; \
pytest soil_id --snapshot-update -k "$(PATTERN)"; \
fi

test-verbose:
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ $ source .venv/bin/activate
$ make install && make install-dev
```

Configure the `.env` file to connect to the local database:

```sh
$ cp .env.sample .env
```

## explanation of algorithm

### terminology
Expand Down
288 changes: 161 additions & 127 deletions requirements-dev.txt

Large diffs are not rendered by default.

723 changes: 372 additions & 351 deletions requirements.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
composition_stats
gdal==3.11.3
gdal==3.11.4
geopandas
numpy
pandas
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,11 @@
},
"site": {
"siteData": {
"componentID": 133621,
"componentID": 133618,
"distance": 3154.198,
"mapunitID": 36084,
"minCompDistance": 3154.19808851,
"share": 10,
"share": 20,
"soilDepth": 40
},
"siteDescription": {
Expand Down Expand Up @@ -1410,7 +1410,7 @@
{
"component": "Dystric leptosols",
"componentData": "Missing Data",
"componentID": 133621,
"componentID": 133618,
"name": "Dystric leptosols",
"not_displayed": false,
"rank_data": "7",
Expand Down
Loading
Loading