Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix python non arrow #1616

Merged
merged 11 commits into from
May 24, 2024
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
8 changes: 6 additions & 2 deletions .github/workflows/_release_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ jobs:
with:
command: install
args: cargo-release --force
- name: "Hide arrow dependencies"
run: ./scripts/hide_arrow_dep.sh
- name: "Publish raphtory-arrow to crates.io"
if: ${{ !inputs.dry_run }}
uses: actions-rs/cargo@v1
with:
command: publish
args: --token ${{ secrets.CRATES_TOKEN }} --package raphtory-arrow --allow-dirty
- name: "Publish raphtory to crates.io"
if: ${{ !inputs.dry_run }}
uses: actions-rs/cargo@v1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test_python_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ jobs:
with:
python-version: ${{ matrix.python }}
cache: 'pip'
- name: Flip raphtory-arrow in Cargo.toml
run: python ./scripts/flip_ra.py Cargo.toml
- name: Run Maturin develop
uses: PyO3/maturin-action@v1
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test_rust_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
name: Cargo cache
with:
cache-all-crates: true
- name: Flip raphtory-arrow in Cargo.toml
run: python ./scripts/flip_ra.py
- name: Install bininstall
uses: cargo-bins/cargo-binstall@main
- name: Install nextest
Expand All @@ -61,7 +63,7 @@ jobs:
RUSTFLAGS: -Awarnings
TEMPDIR: ${{ runner.temp }}
run: |
cargo nextest run --all --no-default-features
cargo nextest run --all --no-default-features --features "arrow"
- name: Run Tests (features=io)
env:
RUSTFLAGS: -Awarnings
Expand Down
88 changes: 6 additions & 82 deletions Cargo.lock

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

9 changes: 1 addition & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
[workspace]
members = [
"raphtory",
"raphtory-storage",
"raphtory-cypher",
"raphtory-benchmark",
"raphtory-arrow",
"examples/rust",
"examples/netflow",
"python",
"js-raphtory",
"raphtory-graphql",
"comparison-benchmark/rust/raphtory-rust-benchmark",
"comparison-benchmark/graphql-benchmark/run_server",
"examples/lanl",
"examples/graph500"
]
default-members = ["raphtory"]
resolver = "2"
Expand Down Expand Up @@ -134,9 +130,6 @@ arrow-schema = { version = "50" }
arrow-data = { version = "50" }
arrow-array = { version = "50" }

# raphtory-arrow = { path = "../raphtory-arrow" }
raphtory-arrow = { git = "ssh://[email protected]/Pometry/raphtory-arrow.git", branch = "master" }

# Make sure that transitive dependencies stick to arrow 50
[patch.crates-io]
arrow = { git = "https://github.com/apache/arrow-rs.git", tag = "50.0.0" }
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ rust-build-docs:
cargo doc --no-deps -p raphtory -q

rust-build-readthedocs:
./scripts/hide_arrow_dep.sh
cargo doc --no-deps -p raphtory -q --target-dir $(RUST_READTHEDOCS_DOCS_TARGET)
rm -rf $(RUST_READTHEDOCS_DOCS_TARGET)/debug
mv $(RUST_READTHEDOCS_DOCS_TARGET)/doc/* $(RUST_READTHEDOCS_DOCS_TARGET)
Expand Down
19 changes: 0 additions & 19 deletions comparison-benchmark/graphql-benchmark/run_server/Cargo.toml

This file was deleted.

22 changes: 0 additions & 22 deletions comparison-benchmark/rust/raphtory-rust-benchmark/Cargo.toml

This file was deleted.

20 changes: 0 additions & 20 deletions examples/graph500/Cargo.toml

This file was deleted.

Loading
Loading