Skip to content

Commit

Permalink
run pre-commit on all files
Browse files Browse the repository at this point in the history
  • Loading branch information
xldeltares committed Jul 6, 2023
1 parent 3c346fa commit 7e914cd
Show file tree
Hide file tree
Showing 19 changed files with 238 additions and 328 deletions.
51 changes: 26 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: ci

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
Expand All @@ -19,27 +20,27 @@ jobs:
os: ["windows-latest"]

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
miniforge-variant: Mambaforge
channels: conda-forge
channel-priority: strict
environment-file: envs/hydromt-delft3dfm.yml
activate-environment: hydromt-delft3dfm
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
miniforge-variant: Mambaforge
channels: conda-forge
channel-priority: strict
environment-file: envs/hydromt-delft3dfm.yml
activate-environment: hydromt-delft3dfm

- name: Conda info
run: |
conda info
conda list
- name: Install hydromt_delft3dfm
run: |
flit install --pth-file
hydromt --models
- name: Test with pytest
run: |
python -m pytest --cov=hydromt_delft3dfm --cov-report xml --cov-report term
- uses: codecov/codecov-action@v1
- name: Conda info
run: |
conda info
conda list
- name: Install hydromt_delft3dfm
run: |
flit install --pth-file
hydromt --models
- name: Test with pytest
run: |
python -m pytest --cov=hydromt_delft3dfm --cov-report xml --cov-report term
- uses: codecov/codecov-action@v1
11 changes: 5 additions & 6 deletions envs/hydromt-delft3dfm.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# note that these are the developer dependencies
name: hydromt-delft3dfm

Expand All @@ -15,7 +16,7 @@ dependencies:
- pandas
- pip
- pre-commit # linting
- pydata-sphinx-theme # docs
- pydata-sphinx-theme # docs
- pygeos
- pyproj
- pytest # tests
Expand All @@ -28,11 +29,9 @@ dependencies:
- shapely>=2.0.0
- sphinx # docs
- sphinx-design # docs
- xarray
- xarray
- xugrid
- networkx
- pip:
- hydrolib-core
- meshkernel


- hydrolib-core
- meshkernel
2 changes: 1 addition & 1 deletion hydromt_delft3dfm/data/channels/spacing_pipe.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pipe,circle,0.8,24
pipe,circle,1.0,24
pipe,circle,1.2,24
pipe,rectangle,,24
pipe,trapeze,,0
pipe,trapeze,,0
18 changes: 9 additions & 9 deletions hydromt_delft3dfm/data/dflowfm/DFlowFM.mdu
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AutoStart = 0
PathsRelativeToParent= 0

[geometry]
NetFile =
NetFile =
BathymetryFile =
DryPointsFile =
GridEnclosureFile =
Expand All @@ -20,16 +20,16 @@ LandBoundaryFile =
ThinDamFile =
FixedWeirFile =
PillarFile =
StructureFile =
StructureFile =
VertplizFile =
CrossDefFile =
CrossLocFile =
FrictFile =
StorageNodeFile =
BranchFile =
CrossDefFile =
CrossLocFile =
FrictFile =
StorageNodeFile =
BranchFile =
RoofsFile =
ProfdefxyzFile =
IniFieldFile =
IniFieldFile =
Uniformwidth1D = 2
ManholeFile =
WaterLevIni = 0
Expand Down Expand Up @@ -179,7 +179,7 @@ RestartDateTime =

[external forcing]
ExtForceFile =
ExtForceFileNew =
ExtForceFileNew =
QExt = 0

[trachytopes]
Expand Down
2 changes: 1 addition & 1 deletion hydromt_delft3dfm/data/landuse/corine_mapping.csv
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ corine,description,landuse,roughness_manning,infiltcap
521,Coastal lagoons,521,0.0150,600.0
522,Estuaries,522,0.150,600.0
523,Sea and ocean,523,0.010,600.0
999,No data,999,-999.0,-999.0
999,No data,999,-999.0,-999.0
2 changes: 1 addition & 1 deletion hydromt_delft3dfm/data/landuse/vito_mapping.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ vito,description ,landuse,roughness_
125 ,Open forest mixed ,125 ,0.055 ,96.0 ,3.0
126 ,Open forest unknown ,126 ,0.055 ,96.0 ,3.0
200 ,Open sea ,200 ,0.025 ,0.0 ,3.0
0 ,No data ,-999.0 ,-999.0 ,-999.0 ,-999.0
0 ,No data ,-999.0 ,-999.0 ,-999.0 ,-999.0
1 change: 1 addition & 0 deletions hydromt_delft3dfm/data/parameters_data.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
vito_mapping:
data_type: DataFrame
driver: csv
Expand Down
Loading

0 comments on commit 7e914cd

Please sign in to comment.