Skip to content

Commit d6efb2a

Browse files
authored
Merge pull request #19 from IGNF/dev
dev -> main pour version 3.0.1
2 parents ca3ff02 + 7a5e313 commit d6efb2a

4 files changed

Lines changed: 18 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# dev
22

3+
# v3.0.1
4+
- lib: use latest ign-pdal-tools (v1.15.8): las buffer: handle different prefix to handle millesime.
5+
36
# v3.0.0
47
- use pdal>=2.9 and deactivate the Dockerfile.pdal from CI
58
- [BREAKING CHANGE] Add a [main.py](las_digital_models/main.py) to run the whole pipeline at once (buffer, DTM, DSM, DHM). Use temporary folders for intermediate values. Refactor config files.

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
# --------------------
99
# Environment creation
1010
# --------------------
11+
create:
12+
mamba env create -n las_digital_models
1113

12-
# mamba env update also works when environment does not exist yet
1314
install:
1415
mamba env update -n las_digital_models -f environment.yml
1516

17+
install-debug:
18+
mamba env update -n las_digital_models -f environment.yml --dry-run -v
19+
1620
install-precommit:
1721
pre-commit install
1822

environment.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- anaconda
55
dependencies:
6-
- python==3.10.*
6+
- python==3.12.*
77
- pip
88
- pytest
99
- gdal
@@ -15,18 +15,18 @@ dependencies:
1515
- python-pdal>=3.4.0
1616
- geopandas
1717
- parallel
18-
# --------- hydra configs --------- #
19-
- hydra-core==1.2.*
20-
- hydra-colorlog==1.2.*
21-
# --------- build and deploy lib -- #
22-
- build
18+
- rasterstats
19+
- rasterio
20+
# --------- hydra configs --------- #
21+
- hydra-core
22+
- hydra-colorlog
23+
# --------- build and deploy lib -- #
2324
- twine
2425
# --------- linting --------------- #
2526
- black
2627
- flake8
2728
- isort
2829
- pre-commit
2930
- pip:
30-
- ign-pdal-tools
31-
- rasterstats
32-
- rasterio # moved here since pdal>=2.9.0 force modern libs to be used and make dependancy graph non resolved
31+
- build
32+
- ign-pdal-tools

las_digital_models/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "3.0.0"
1+
__version__ = "3.0.1"
22

33

44
if __name__ == "__main__":

0 commit comments

Comments
 (0)