From aae4d13120e3a3f4e4d13764887f1fa7bd57e130 Mon Sep 17 00:00:00 2001 From: Radu Suciu Date: Wed, 6 Mar 2024 14:59:08 -0800 Subject: [PATCH 1/3] chore(pypi): add .gitignore for python wheel build --- pypi/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pypi/.gitignore diff --git a/pypi/.gitignore b/pypi/.gitignore new file mode 100644 index 0000000000..701e62ebaf --- /dev/null +++ b/pypi/.gitignore @@ -0,0 +1,5 @@ +# venv dir which might be present during testing +.venv + +# where the build artifacts go +wheels From b74f66fb8262e6bb0b7fcc60814314ac981149d8 Mon Sep 17 00:00:00 2001 From: Radu Suciu Date: Wed, 6 Mar 2024 15:01:13 -0800 Subject: [PATCH 2/3] chore(pypi): move maturin package metadata to pyproject.toml use of `[package.metadata.maturin.name]` is deprecated and warned against: `Warning: specify [package.metadata.maturin] name in Cargo.toml is deprecated, use module-name in [tool.maturin] section in pyproject.toml instead` --- git-cliff/Cargo.toml | 3 --- pypi/pyproject.toml | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/git-cliff/Cargo.toml b/git-cliff/Cargo.toml index 92c2ab97a5..3db3ddaa9f 100644 --- a/git-cliff/Cargo.toml +++ b/git-cliff/Cargo.toml @@ -57,9 +57,6 @@ pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target bin-dir = "{ name }-{ version }/{ bin }{ binary-ext }" pkg-fmt = "tgz" -[package.metadata.maturin] -name = "git-cliff" - [package.metadata.generate-rpm] assets = [ { source = "target/release/git-cliff", dest = "/usr/bin/git-cliff", mode = "755" }, diff --git a/pypi/pyproject.toml b/pypi/pyproject.toml index f3d21e3c24..9cfaf5152a 100644 --- a/pypi/pyproject.toml +++ b/pypi/pyproject.toml @@ -15,4 +15,5 @@ classifiers = [ [tool.maturin] bindings = "bin" -manifest-path = "../git-cliff/Cargo.toml" \ No newline at end of file +manifest-path = "../git-cliff/Cargo.toml" +module-name = "git-cliff" From cd12b8209c96e65a201efa524a82995b829c40d1 Mon Sep 17 00:00:00 2001 From: Radu Suciu Date: Wed, 6 Mar 2024 15:02:32 -0800 Subject: [PATCH 3/3] chore(pypi): update maturin version the previously pinned version was way too specific and maturin has since had a 1.0 release -- so let's just stick with that. --- pypi/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypi/pyproject.toml b/pypi/pyproject.toml index 9cfaf5152a..1ea7f37f55 100644 --- a/pypi/pyproject.toml +++ b/pypi/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=0.14,<0.15"] +requires = ["maturin>=1.5,<2"] build-backend = "maturin" [project]