Skip to content

Commit b23449b

Browse files
authored
Merge pull request #190 from siapy/develop
Develop
2 parents ba9e6c1 + d333c44 commit b23449b

File tree

88 files changed

+2306
-1719
lines changed

Some content is hidden

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

88 files changed

+2306
-1719
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
* text=auto
2-
tests/data/* filter=lfs diff=lfs merge=lfs -text

.github/workflows/docs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
uses: actions/checkout@v4
1919
- name: Setup PDM
2020
uses: pdm-project/setup-pdm@v4
21+
with:
22+
python-version: 3.10
23+
cache: true
2124
- name: Install dependencies
2225
run: pdm install -G docs
2326
- name: Build MkDocs site

.github/workflows/publish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
- uses: pdm-project/setup-pdm@v4
3838
with:
39-
version: "head"
39+
python-version: 3.10
40+
cache: true
4041
- name: Publish package distributions to PyPI
4142
run: pdm publish

.github/workflows/test.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@ on:
1111
jobs:
1212
test:
1313
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
python-version: ["3.10", "3.11", "3.12"]
17+
fail-fast: false
18+
19+
name: Test Python ${{ matrix.python-version }}
1420
steps:
1521
- name: Checkout
1622
uses: actions/checkout@v4
17-
with:
18-
lfs: true # This option ensures that Git LFS files are checked out
1923
- name: Setup PDM
2024
uses: pdm-project/setup-pdm@v4
25+
with:
26+
python-version: ${{ matrix.python-version }}
27+
cache: true
2128
- name: Install dependencies
2229
run: pdm install
2330
- name: Lint code
@@ -27,6 +34,8 @@ jobs:
2734
run: ./scripts/test.sh "Coverage for ${{ github.sha }}"
2835
- name: Store coverage files
2936
uses: actions/upload-artifact@v4
37+
# Only upload for Python 3.12
38+
if: matrix.python-version == '3.12'
3039
with:
3140
name: coverage-html
3241
path: htmlcov

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ venv
1313
.history
1414
site
1515
dist
16-
tests/data
16+
tests/data/*
1717
docs/examples/data/*
18-
!docs/examples/data/.gitkeep
18+
!.gitkeep

.pre-commit-config.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ repos:
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.9.1
17+
rev: v0.9.10
1818
hooks:
1919
- id: ruff
2020
args:
2121
- --fix
22+
- --config=pyproject.toml
23+
files: ^(siapy|tests)/
2224
- id: ruff-format
2325
- repo: https://github.com/gitleaks/gitleaks
24-
rev: v8.23.0
26+
rev: v8.24.0
2527
hooks:
2628
- id: gitleaks
2729
- repo: https://github.com/codespell-project/codespell
28-
rev: v2.3.0
30+
rev: v2.4.1
2931
hooks:
3032
- id: codespell
3133
additional_dependencies:

Makefile

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ lint: .pdm
3030
test: .pdm
3131
./scripts/test.sh "Develop"
3232

33+
.PHONY: flt ## Run format, lint, and test
34+
flt: format lint test
35+
3336
.PHONY: codespell ## Use Codespell to do spellchecking
3437
codespell: .pre-commit
3538
pdm run pre-commit run codespell --all-files
@@ -47,24 +50,7 @@ update-branches:
4750

4851
.PHONY: clean ## Clear local caches and build artifacts
4952
clean:
50-
rm -rf `find . -name __pycache__`
51-
rm -f `find . -type f -name '*.py[co]'`
52-
rm -f `find . -type f -name '*~'`
53-
rm -f `find . -type f -name '.*~'`
54-
rm -rf .pdm-build
55-
rm -rf .mypy_cache
56-
rm -rf .cache
57-
rm -rf .pytest_cache
58-
rm -rf .ruff_cache
59-
rm -rf htmlcov
60-
rm -rf *.egg-info
61-
rm -f .coverage
62-
rm -f .coverage.*
63-
rm -rf build
64-
rm -rf dist
65-
rm -rf site
66-
rm -rf docs/_build
67-
rm -rf coverage.xml
53+
./scripts/clean.sh
6854

6955
.PHONY: generate-docs ## Generate the docs
7056
generate-docs:
@@ -78,6 +64,10 @@ serve-docs:
7864
version:
7965
python -c "import siapy; print(siapy.__version__)"
8066

67+
.PHONY: compress-data ## Compress the data files
68+
compress-data:
69+
./scripts/compress-data.sh $(version)
70+
8171
.PHONY: help ## Display this message
8272
help:
8373
@grep -E \

docs/api/entities/images.md

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
::: siapy.entities.images.interfaces
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
::: siapy.entities.images.rasterio_lib

0 commit comments

Comments
 (0)