Skip to content
Merged
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
6,090 changes: 656 additions & 5,434 deletions .github/pixi.lock

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions .github/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ channels = ["conda-forge"]
platforms = ["linux-64", "osx-64", "win-64"]

[dependencies]
python = "*"
pytest = ">=9.0.0"
# these should match pixi.toml
geoarrow-pyarrow = ">=0.2.0"
geopandas = ">=1.0.0"
rich-click = ">=1.9.0"
sedonadb = ">=0.3.0"
python = ">=3.11.15,<3.15"
pytest = ">=9.0.3,<10"
# these should match the root pixi.toml
geoarrow-pyarrow = ">=0.2.0,<0.3"
geopandas = ">=1.1.3,<2"
rich-click = ">=1.9.7,<2"
sedonadb = ">=0.3.0,<0.4"

[tasks]
test = "pytest ../tests"
Expand All @@ -24,17 +24,17 @@ py313 = { features = ["py313"] }
py314 = { features = ["py314"] }

[feature.py311.dependencies]
python = "3.11.*"
sedonadb = ">=0.3.0"
python = ">=3.14.4,<3.15"
sedonadb = ">=0.3.0,<0.4"

[feature.py312.dependencies]
python = "3.12.*"
sedonadb = ">=0.3.0"
python = ">=3.14.4,<3.15"
sedonadb = ">=0.3.0,<0.4"

[feature.py313.dependencies]
python = "3.13.*"
sedonadb = ">=0.3.0"
python = ">=3.14.4,<3.15"
sedonadb = ">=0.3.0,<0.4"

[feature.py314.dependencies]
python = "3.14.*"
sedonadb = ">=0.3.0"
python = ">=3.14.4,<3.15"
sedonadb = ">=0.3.0,<0.4"
24 changes: 16 additions & 8 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# https://github.com/marketplace/actions/setup-pixi
name: Update Test Coverage

on:
workflow_dispatch:
# push:
# branches: [ "main" ]
# paths: [ "src/**" ]
push:
branches: [ "dev" ]
paths: [ "src/**", "tests/**" ]

jobs:
coverage:
runs-on: ubuntu-latest

steps:

# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -20,6 +24,8 @@ jobs:
src
tests
sparse-checkout-cone-mode: false

# https://github.com/marketplace/actions/setup-pixi
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.67.2
Expand All @@ -28,12 +34,14 @@ jobs:
activate-environment: true
locked: false
frozen: true

- name: Run coverage
run: pixi run coverage

- name: Push changes
run: |
git config --local user.email "dev@corbelspatial.com"
git config --local user.name "p-vdp"
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add ./docs/pytest_coverage.json
git commit -m "GitHub Action: Update Test Coverage"
git commit -m "Update Test Coverage"
git push
10 changes: 7 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# https://github.com/marketplace/actions/setup-pixi
name: Lint Check
on:
workflow_dispatch:
push:
branches: [ "main" ]
paths: [ "src/**" ]
branches: [ "main", "dev" ]
paths: [ "src/**", "tests/**" ]

jobs:
lint:
runs-on: ubuntu-latest

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -19,6 +21,8 @@ jobs:
src
tests
sparse-checkout-cone-mode: false

# https://github.com/marketplace/actions/setup-pixi
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.67.2
Expand Down
22 changes: 19 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,58 @@
# https://github.com/pypa/gh-action-pypi-publish
name: Upload Python Package to PyPI
name: Upload Package to PyPI
on:
release:
types: [published]

permissions:
contents: read

jobs:
release-build:
runs-on: ubuntu-latest

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6

# https://github.com/actions/setup-python
- uses: actions/setup-python@v6
with:
python-version: "3.x"

- name: Build release distributions
run: |
python -m pip install hatchling
python -m hatchling build

- name: Upload distributions
# https://github.com/actions/upload-artifact
uses: actions/upload-artifact@v7
with:
name: release-dists
path: dist/

pypi-publish:
runs-on: ubuntu-latest

needs:
- release-build

permissions:
id-token: write

environment:
name: pypi

steps:
- name: Retrieve release distributions
uses: actions/download-artifact@v4
# https://github.com/actions/download-artifact
uses: actions/download-artifact@v8
with:
name: release-dists
path: dist/

- name: Publish release distributions to PyPI
# https://github.com/pypa/gh-action-pypi-publish
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: dist/
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ on:
branches: [ "main" ]
paths: [ "src/**" ]
jobs:
test-on-prerelease:
test-on-prerelease-python:
runs-on: ubuntu-latest

container: ghcr.io/corbel-spatial/here-be-dragons:next

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -16,28 +20,27 @@ jobs:
src
tests
sparse-checkout-cone-mode: false
- run: |
docker run --name tester --rm -id --mount type=bind,source=./,target=/root/checkout ghcr.io/corbel-spatial/here-be-dragons:next
docker exec -w /root/checkout tester bash -c '

# install runtime dependencies from source

- name: Install dependencies
run: |
uv pip install --system \
https://github.com/geopandas/pyogrio.git
https://github.com/pandas-dev/pandas.git
https://github.com/geopandas/geopandas.git

# build and install sedonadb from source
uv pip install --system maturin[patchelf] pytest
uv pip install --system maturin[patchelf] pytest
uv venv --system-site-packages

- name: Build sources
run: |
source .venv/bin/activate
git clone --depth 1 https://github.com/apache/sedona-db.git
cd sedona-db/python/sedonadb
maturin develop --release
deactivate
uv pip install --system .

# install and test giso

- name: Run tests
run: |
cd /root/checkout
uv pip install --system .
pytest ./tests -vv -s
'
4 changes: 3 additions & 1 deletion .github/workflows/pytest-linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# https://github.com/marketplace/actions/setup-pixi
name: Pytest - Linux
on:
workflow_dispatch:
Expand All @@ -13,6 +12,7 @@ jobs:
matrix:
environment: [ py311, py312, py313, py314 ]
steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -23,6 +23,8 @@ jobs:
src
tests
sparse-checkout-cone-mode: false

# https://github.com/marketplace/actions/setup-pixi
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.67.2
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pytest-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
matrix:
environment: [py311, py312, py313, py314]
steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -23,7 +24,10 @@ jobs:
src
tests
sparse-checkout-cone-mode: false

- run: brew install proj

# https://github.com/marketplace/actions/setup-pixi
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.67.2
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pytest-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
matrix:
environment: [py311, py312, py313, py314]
steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v6
with:
sparse-checkout: |
Expand All @@ -23,6 +24,7 @@ jobs:
src
tests
sparse-checkout-cone-mode: false
# https://github.com/marketplace/actions/setup-pixi
- uses: prefix-dev/setup-pixi@v0.9.4
with:
pixi-version: v0.67.2
Expand Down
2 changes: 1 addition & 1 deletion .idea/giso.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading