summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2023-09-28 07:01:16 -0400
committerGitHub <noreply@github.com>2023-09-28 07:01:16 -0400
commitc690fd16c48338cac14111d725c137db25436467 (patch)
tree2dcdd26175de7410c7224888cfa55260f94e7995
parentMerge branch 'master' into develop (diff)
downloadsynapse-c690fd16c48338cac14111d725c137db25436467.tar.xz
Use modern config for maturin. (#16394)
This allows maturin >= 0.15 to build the properly named
shared library object.

For now the old configuration is also kept to allow for
older maturin installs to be used.
-rw-r--r--changelog.d/16394.misc1
-rw-r--r--pyproject.toml1
-rw-r--r--rust/Cargo.toml2
3 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/16394.misc b/changelog.d/16394.misc
new file mode 100644

index 0000000000..ee08c3e024 --- /dev/null +++ b/changelog.d/16394.misc
@@ -0,0 +1 @@ +Update maturin configuration. diff --git a/pyproject.toml b/pyproject.toml
index bf51276f4a..5fb64479a1 100644 --- a/pyproject.toml +++ b/pyproject.toml
@@ -92,6 +92,7 @@ skip_gitignore = true [tool.maturin] manifest-path = "rust/Cargo.toml" +module-name = "synapse.synapse_rust" [tool.poetry] name = "matrix-synapse" diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 16917136db..26403d58cc 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml
@@ -15,6 +15,8 @@ name = "synapse" # tests/benchmarks. crate-type = ["lib", "cdylib"] +# This is deprecated, see tool.maturin in pyproject.toml. +# It is left here for compatibilty with maturin < 0.15. [package.metadata.maturin] # This is where we tell maturin where to place the built library. name = "synapse.synapse_rust"