Skip to content

Commit

Permalink
Update OM package name/version for Maturin
Browse files Browse the repository at this point in the history
  • Loading branch information
ginty committed Aug 6, 2024
1 parent c9731b7 commit 7743420
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 41 deletions.
19 changes: 11 additions & 8 deletions python/origen_metal/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[tool.poetry]
name = "origen_metal"
version = "0.4.1.dev2"
version = "0.4.1-dev2"
description = "Bare metal APIs for the Origen SDK"
homepage = "https://origen-sdk.org/o2"
license = "MIT"
readme = "README.md"
authors = ["Origen-SDK"]
include = [
"origen_metal/_origen_metal.pyd", # Windows
"origen_metal/_origen_metal.so", # Linux
]
#include = [
# "origen_metal/_origen_metal.pyd", # Windows
# "origen_metal/_origen_metal.so", # Linux
#]

[tool.poetry.dependencies]
python = ">=3.7.0,<3.13"
Expand Down Expand Up @@ -39,6 +39,9 @@ generate-setup-file = false
# This needs to be present to build for Linux, but does not work
# for the current Windows build flow
# This is currently added back in by the Linux Github actions job
#[build-system]
#requires = ["maturin>=1.0,<2.0"]
#build-backend = "maturin"
[build-system]
requires = ["maturin>=1.0,<2.0"]
build-backend = "maturin"

[tool.maturin]
module-name = "origen_metal._origen_metal"
30 changes: 15 additions & 15 deletions rust/pyapi/Cargo.lock

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

4 changes: 2 additions & 2 deletions rust/pyapi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ crate-type = ["cdylib"]
[dependencies]
origen = { path = "../origen" }
origen_metal = { path = "../origen_metal", features = ["python"] }
pyapi_metal = { path = "../pyapi_metal", package = "pyapi_metal" }
pyapi_metal = { path = "../pyapi_metal", package = "origen-metal" }
num-bigint = "0.4.0"
num-traits = "0.2.0"
num = "0.2.0"
Expand All @@ -36,4 +36,4 @@ version = "0.19.1"
features = ["extension-module", "num-bigint", "multiple-pymethods", "auto-initialize"]

[build-dependencies]
built = "0.5.2"
built = "0.5.2"
28 changes: 14 additions & 14 deletions rust/pyapi_metal/Cargo.lock

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

4 changes: 2 additions & 2 deletions rust/pyapi_metal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pyapi_metal"
version = "0.4.0"
name = "origen-metal"
version = "0.4.1-dev2"
edition = "2021"
authors = ["Origen-SDK"]

Expand Down

0 comments on commit 7743420

Please sign in to comment.