From 2b71197ad6b9643fa447db169286ac01dcaae23e Mon Sep 17 00:00:00 2001 From: Diogo Matsubara Date: Tue, 17 Sep 2024 20:40:26 +0200 Subject: [PATCH] fix: edit version for devel builds (#323) * fix: edit version for devel builds On development builds, use a PEP-440 compatible version, since maturin>1 requires stricter version checking. * chore: update maturin in dev reqs * Update ci/scripts/bump-and-tag.bash Co-authored-by: Mahmoud Mazouz --------- Co-authored-by: Mahmoud Mazouz --- ci/scripts/bump-and-tag.bash | 5 +++++ requirements-dev.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/scripts/bump-and-tag.bash b/ci/scripts/bump-and-tag.bash index a883352c..bcae003c 100644 --- a/ci/scripts/bump-and-tag.bash +++ b/ci/scripts/bump-and-tag.bash @@ -30,6 +30,11 @@ export GIT_AUTHOR_EMAIL=$git_user_email export GIT_COMMITTER_NAME=$git_user_name export GIT_COMMITTER_EMAIL=$git_user_email +# For development releases (e.g. 1.0.0-dev-21-g2ca8632), transform the version +# into a PEP-440 compatible version, since maturin>1 requires strict version compliance. +if [[ "${version}" =~ [0-9]+\.[0-9]+\.[0-9]+-dev-[0-9]+-g[a-f0-9]+ ]]; then + version=$(echo $version | sed 's/dev-/dev+/') + # Bump Cargo version toml_set_in_place Cargo.toml "package.version" "$version" # Propagate version change to pyproject.toml diff --git a/requirements-dev.txt b/requirements-dev.txt index 57036357..ceccb8a3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1 +1 @@ -maturin>=0.13,<0.15 +maturin>1