Skip to content

Commit 356681c

Browse files
committed
merge dev branch: version 0.2.11
1 parent 11d9b7a commit 356681c

File tree

131 files changed

+76505
-1444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+76505
-1444
lines changed

.github/workflows/docs-build.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@ jobs:
1010
- uses: actions/checkout@v3
1111
- uses: actions/setup-python@v4
1212
with:
13-
python-version: 3.9
13+
python-version: "3.11"
14+
- name: Install uv
15+
uses: astral-sh/setup-uv@v3
16+
with:
17+
version: "latest"
1418
- name: Install dependencies
1519
run: |
16-
python -m pip install --upgrade pip
17-
pip install --user --no-cache-dir Cython
18-
pip install --user -r requirements.txt
19-
pip install .
20+
uv pip install --system --no-cache-dir Cython
21+
uv sync --extra docs
2022
- name: Discover typos with codespell
2123
run: |
22-
pip install codespell
23-
codespell --skip="*.csv,*.geojson,*.json,*.js,*.html,*cff,./.git" --ignore-words-list="aci,acount,acounts,fallow,hart,hist,nd,ned,ois,wqs,watermask"
24+
uv tool install codespell
25+
uv tool run codespell --skip="*.csv,*.geojson,*.json,*.js,*.html,*cff,./.git" --ignore-words-list="aci,acount,acounts,fallow,hart,hist,nd,ned,ois,wqs,watermask"
2426
- name: PKG-TEST
2527
run: |
2628
python -m unittest discover tests/
27-
- run: pip install -r requirements_docs.txt
29+
# Dependencies are already installed with -e .[docs]
2830
- run: mkdocs gh-deploy --force

.github/workflows/macos.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
os: ["macOS-latest"]
18-
python-version: ["3.10"]
18+
python-version: ["3.11"]
1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@v3
@@ -24,6 +24,10 @@ jobs:
2424
uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version}}
27+
- name: Install uv
28+
uses: astral-sh/setup-uv@v3
29+
with:
30+
version: "latest"
2731
- name: Install GDAL
2832
run: |
2933
brew install gdal
@@ -32,7 +36,4 @@ jobs:
3236
gdalinfo --version
3337
- name: Install dependencies
3438
run: |
35-
python -m pip install --upgrade pip
36-
pip install --no-cache-dir Cython
37-
pip install -r requirements.txt
38-
pip install .
39+
uv sync --extra dev

.github/workflows/pypi.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
- name: Set up Python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: "3.10"
20-
- name: Install dependencies
21-
run: |
22-
python -m pip install --upgrade pip
23-
pip install setuptools wheel twine
19+
python-version: "3.11"
20+
- name: Install uv
21+
uses: astral-sh/setup-uv@v3
22+
with:
23+
version: "latest"
2424
- name: Build and publish
2525
env:
2626
TWINE_USERNAME: ${{ secrets.PYPI_USERS }}
2727
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2828
run: |
29-
python setup.py sdist bdist_wheel
30-
twine upload dist/*
29+
uv build
30+
uv tool run twine upload dist/*

.github/workflows/ubuntu.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,29 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
config:
18-
- { os: ubuntu-latest, py: "3.10" }
18+
- { os: ubuntu-latest, py: "3.11" }
1919
steps:
2020
- name: Checkout Code
2121
uses: actions/checkout@v3
2222
- name: Setup Python
2323
uses: actions/setup-python@v4
2424
with:
2525
python-version: ${{ matrix.config.py }}
26+
- name: Install uv
27+
uses: astral-sh/setup-uv@v3
28+
with:
29+
version: "latest"
2630
- name: Install GDAL
2731
run: |
28-
python -m pip install --upgrade pip
29-
pip install --no-cache-dir Cython
30-
pip install --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL
32+
uv pip install --system --no-cache-dir Cython
33+
uv pip install --system --find-links=https://girder.github.io/large_image_wheels --no-cache GDAL
3134
- name: Test GDAL installation
3235
run: |
3336
python -c "from osgeo import gdal"
3437
gdalinfo --version
3538
- name: Install dependencies
3639
run: |
37-
pip install --user -r requirements.txt
38-
pip install --user -r requirements_dev.txt
39-
pip install .
40+
uv sync --extra dev
4041
- name: Create hydro_setting.yml
4142
run: |
4243
echo 'local_data_path:' > hydro_setting.yml

.github/workflows/windows.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@ jobs:
1212
runs-on: windows-latest
1313
steps:
1414
- uses: actions/checkout@v3
15-
- name: Install miniconda
15+
- name: Setup Python
16+
uses: actions/setup-python@v4
17+
with:
18+
python-version: "3.11"
19+
- name: Install uv
20+
uses: astral-sh/setup-uv@v3
21+
with:
22+
version: "latest"
23+
- name: Install GDAL via conda (Windows-specific)
1624
uses: conda-incubator/setup-miniconda@v2
1725
with:
1826
auto-activate-base: true
19-
python-version: "3.10"
27+
python-version: "3.11"
2028
- name: Install GDAL
2129
run: conda install -c conda-forge gdal --yes
2230
- name: Test GDAL installation
@@ -25,10 +33,7 @@ jobs:
2533
gdalinfo --version
2634
- name: Install dependencies
2735
run: |
28-
python -m pip install --upgrade pip
29-
pip install --no-cache-dir Cython
30-
pip install -r requirements.txt
31-
pip install .
36+
uv sync --extra dev
3237
# - name: PKG-TEST
3338
# run: |
3439
# python -m pytest test/test_data_preprocess.py

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,13 @@ hydromodel/example/example/*
175175
!/hydromodel/example/example/data_info_*.json
176176
!/hydromodel/example/daily_flow_27071.txt
177177
!/hydromodel/example/daily_rainfall_27071.txt
178-
outputs/
178+
# Exclude all files in data directory
179+
/data/*
180+
# But allow specific files
181+
!/data/dhf_data.json
182+
outputs/
183+
result_old/
184+
results/*
185+
CLAUDE.md
186+
.claude/*
187+
GEMINI.md

0 commit comments

Comments
 (0)