Skip to content

Commit 759a5b3

Browse files
kylebarronkylebarron
authored
chore: Clean up post extraction from geoarrow-rs repo (#2)
* Add top-level Readme * Compiles * compiles * top-level Cargo.toml cleanup * Python cleanup * Remove unnecessary ci workflows * fix compile * Don't try to build docs * Add minimal fixture * Rename test file
1 parent 7dec658 commit 759a5b3

17 files changed

Lines changed: 3441 additions & 2264 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ jobs:
2323
with:
2424
components: rustfmt, clippy
2525
- uses: Swatinem/rust-cache@v2
26-
- uses: prefix-dev/setup-pixi@v0.8.1
27-
with:
28-
activate-environment: true
29-
cache: true
30-
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
31-
manifest-path: build/pixi.toml
32-
- name: Tweak environment to find GDAL
33-
run: |
34-
echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
35-
echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
3626
- name: Clippy
3727
run: cargo clippy --all-features --tests -- -D warnings
3828
- name: Check
@@ -65,78 +55,8 @@ jobs:
6555
- name: Install Rust
6656
uses: dtolnay/rust-toolchain@stable
6757

68-
# TODO: switch back to pixi environment
69-
- name: Install GEOS
70-
run: |
71-
sudo apt-get update
72-
sudo apt-get install -y libgeos-dev
73-
7458
# Note: in the future expand to all crates in the workspace
7559
- name: Test that docs build without warnings
7660
run: cargo doc --all-features --document-private-items
7761
env:
7862
RUSTDOCFLAGS: "-D warnings"
79-
80-
# This part of the old test suite from `geoarrow` used external dependencies,
81-
# especially GEOS, GDAL, and PROJ. Come back to this once we use these
82-
# dependencies from inside the refactored geoarrow-* crates.
83-
84-
# check-features-with-external-dependencies:
85-
# runs-on: ubuntu-latest
86-
# strategy:
87-
# fail-fast: false
88-
# matrix:
89-
# args:
90-
# - ""
91-
# - "-F csv"
92-
# - "-F flatgeobuf"
93-
# - "-F flatgeobuf_async"
94-
# - "-F ipc_compression"
95-
# - "-F polylabel"
96-
# - "-F postgis"
97-
# - "-F rayon"
98-
# - "-F gdal -F gdal/bindgen"
99-
# - "-F geos"
100-
# - "-F proj"
101-
# steps:
102-
# - uses: actions/checkout@v4
103-
# with:
104-
# submodules: "recursive"
105-
# - uses: dtolnay/rust-toolchain@stable
106-
# - uses: Swatinem/rust-cache@v2
107-
# - uses: prefix-dev/setup-pixi@v0.8.1
108-
# with:
109-
# activate-environment: true
110-
# cache: true
111-
# cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
112-
# manifest-path: build/pixi.toml
113-
# - name: Tweak environment to find GDAL
114-
# run: |
115-
# echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
116-
# echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
117-
# - name: Test
118-
# run: cargo check ${{ matrix.args }}
119-
120-
# We don't build benchmarks on CI because they're quite slow to compile
121-
# build-benchmarks:
122-
# runs-on: ubuntu-latest
123-
# steps:
124-
# - uses: actions/checkout@v4
125-
# with:
126-
# submodules: "recursive"
127-
# - uses: dtolnay/rust-toolchain@stable
128-
# - uses: Swatinem/rust-cache@v2
129-
# - uses: prefix-dev/setup-pixi@v0.8.1
130-
# with:
131-
# activate-environment: true
132-
# cache: true
133-
# cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
134-
# manifest-path: build/pixi.toml
135-
# - name: Tweak environment to find GDAL
136-
# run: |
137-
# echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
138-
# echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
139-
# - name: Build benchmarks with no features
140-
# run: cargo bench --no-run
141-
# - name: Build benchmarks with all features
142-
# run: cargo bench --no-run --all-features

‎.github/workflows/python-docs.yml‎

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

‎.github/workflows/python.yml‎

Lines changed: 4 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,6 @@ jobs:
4242
- name: Test
4343
run: cargo test
4444

45-
emscripten:
46-
name: Build pyodide wheel
47-
runs-on: ubuntu-latest
48-
steps:
49-
- uses: actions/checkout@v4
50-
- run: pip install pyodide-build
51-
- name: Get Emscripten and Python version info
52-
shell: bash
53-
run: |
54-
echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV
55-
echo PYTHON_VERSION=$(pyodide config get python_version | cut -d '.' -f 1-2) >> $GITHUB_ENV
56-
pip uninstall -y pyodide-build
57-
- uses: mymindstorm/setup-emsdk@v14
58-
with:
59-
version: ${{ env.EMSCRIPTEN_VERSION }}
60-
actions-cache-folder: emsdk-cache
61-
- uses: actions/setup-python@v5
62-
with:
63-
python-version: ${{ env.PYTHON_VERSION }}
64-
- run: pip install pyodide-build
65-
66-
- name: Build wheels (core)
67-
uses: PyO3/maturin-action@v1
68-
with:
69-
target: wasm32-unknown-emscripten
70-
args: --no-default-features -m python/geoarrow-core/Cargo.toml -i python${{ env.PYTHON_VERSION }}
71-
rust-toolchain: nightly
72-
73-
# This started to fail as of https://github.com/geoarrow/geoarrow-rs/pull/1170
74-
# - name: Build wheels (io)
75-
# uses: PyO3/maturin-action@v1
76-
# with:
77-
# target: wasm32-unknown-emscripten
78-
# args: --no-default-features -m python/geoarrow-io/Cargo.toml -i python${{ env.PYTHON_VERSION }}
79-
# rust-toolchain: nightly
80-
81-
# lint-python:
82-
# name: Lint Python code
83-
# runs-on: ubuntu-latest
84-
# steps:
85-
# - uses: actions/checkout@v4
86-
87-
# - name: Set up Python 3.8
88-
# uses: actions/setup-python@v2
89-
# with:
90-
# python-version: "3.8"
91-
92-
# - name: run pre-commit
93-
# run: |
94-
# python -m pip install pre-commit
95-
# pre-commit run --all-files
96-
9745
test-python:
9846
name: Build and test Python
9947
runs-on: ubuntu-latest
@@ -128,17 +76,8 @@ jobs:
12876

12977
- name: Build rust submodules
13078
run: |
131-
# Note: core module should be first, because it could be depended on
132-
# by others in the future
133-
uv run maturin develop -m geoarrow-core/Cargo.toml
134-
uv run maturin develop -m geoarrow-compute/Cargo.toml
135-
uv run maturin develop -m geoarrow-io/Cargo.toml
136-
137-
# Ensure docs build without warnings
138-
- name: Check docs
139-
if: "${{ matrix.python-version == 3.12 }}"
140-
run: uv run mkdocs build --strict
79+
uv run maturin develop -m geodatafusion/Cargo.toml
14180
142-
# - name: Run python tests
143-
# run: |
144-
# uv run pytest tests
81+
- name: Run python tests
82+
run: |
83+
uv run pytest tests

‎.github/workflows/wasm.yml‎

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

0 commit comments

Comments
 (0)