Skip to content

Commit

Permalink
adjust name, fix ci for linux (sudo) and windows (vcpkg and static)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoolive committed Aug 7, 2024
1 parent aa2269e commit b536c19
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 368 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
python-version: 3.x
- name: Install pkg-config by apt
run: |
apt update
apt install -y pkg-config
sudo apt update
sudo apt install -y pkg-config
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
Expand Down Expand Up @@ -79,8 +79,8 @@ jobs:
python-version: 3.x
- name: Install pkg-config by apt
run: |
apt update
apt install -y pkg-config
sudo apt update
sudo apt install -y pkg-config
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
Expand Down Expand Up @@ -126,6 +126,7 @@ jobs:
uses: PyO3/maturin-action@v1
env:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
RUSTFLAGS: "-C target-feature=+crt-static"
with:
working-directory: python
target: ${{ matrix.platform.target }}
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT"
edition = "2021"
readme = "readme.md"
version = "0.1.0"
authors = ["Xavier Olive <git@xoolive.org"]
authors = ["Xavier Olive <git@xoolive.org>"]

[profile.release]
lto = true
Expand Down
6 changes: 6 additions & 0 deletions crates/trafficrs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ ndarray-linalg = { version = "0.16.0", features = ["openblas-static"] }
numpy = "0.21.0"
polars = { version = "0.41.3", features = ["lazy", "rolling_window"] }
polars-core = "0.41.3"

[target.'cfg(windows)'.dependencies]
ndarray-linalg = { version = "0.16.0", features = [
"openblas-static",
"openblas-system",
] }
9 changes: 8 additions & 1 deletion python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
[package]
name = "trafficrs-python"
name = "traffic-thrust"
description = "Python binding to trafficrs core functions (Rust version of traffic)"
repository = "https://github.com/xoolive/traffic-rs"
readme = "readme.md"
authors.workspace = true
version.workspace = true
license.workspace = true
edition.workspace = true
exclude = [
"__pycache__",
"**/__pycache__",
"**/__pycache__/**",
"*.pyc",
"**/*.pyc",
]

[lib]
name = "thrust"
Expand Down
335 changes: 0 additions & 335 deletions python/poetry.lock

This file was deleted.

51 changes: 31 additions & 20 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,21 @@
requires = ["maturin>=1.4,<2.0"]
build-backend = "maturin"

[tool.poetry]
name = "thrust"
version = "0.1.0"
description = "traffic core functions implemented in Rust for performance"
authors = ["Xavier Olive <git@xoolive.org>"]
[project]
name = "traffic_thrust"
requires-pyth