build-wheel: use multiple versions of a pr in testpipy (#2709)

.github/workflows/build-wheel.yml

@@ -49,17 +49,14 @@ jobs:
           git config user.email marcelotduarte@users.noreply.github.com
           SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
           VERSION=$(bump-my-version show current_version 2>/dev/null)
-          if ! (echo $VERSION | grep -q "\-dev"); then
-            bump-my-version bump --no-tag patch 2>/dev/null
-            VERSION=$(bump-my-version show current_version 2>/dev/null)
-          fi
+          VERSION_BASE=$(python -c "print('$VERSION'.rsplit('-',1)[0])")
           if [ "${{ github.event_name }}" == "pull_request" ]; then
-            BUILD_NUMBER=${{ github.event.number }}
+            OPTIONAL=".${{ github.event.number }}"
           else
-            BUILD_NUMBER=$SOURCE_DATE_EPOCH
+            OPTIONAL=""
           fi
-          NEWVERSION=$(python -c "print('$VERSION'.rsplit('.',1)[0])").$BUILD_NUMBER
-          bump-my-version bump --no-tag build --new-version=$NEWVERSION 2>/dev/null
+          VERSION_NEW=$VERSION_BASE$OPTIONAL-dev.$SOURCE_DATE_EPOCH
+          bump-my-version bump --no-tag build --new-version=$VERSION_NEW 2>/dev/null
           git log -1
 
       - name: Build sdist and wheels

ci/build-wheel.sh

@@ -81,7 +81,11 @@ fi
 echo "::endgroup::"
 
 if ! [ "$CI" == "true" ]; then
-    VERSION_OK=$($PYTHON -c "print(''.join('$VERSION'.replace('-','.').rsplit('.',1)), end='')")
+    if [[ $VERSION == *-* ]]; then
+        VERSION_OK=$($PYTHON -c "print(''.join('$VERSION'.replace('-','.').rsplit('.',1)), end='')")
+    else
+        VERSION_OK=$VERSION
+    fi
     echo "::group::Install cx_Freeze $VERSION_OK"
     UV_PYTHON=$UV_PYTHON UV_PRERELEASE=allow \
         uv pip install "cx_Freeze==$VERSION_OK" --no-index --no-deps -f wheelhouse --reinstall

pyproject.toml

@@ -128,8 +128,21 @@ target-version = ["py39"]
 commit = true
 current_version = "7.3.0-dev.1"
 message = "Bump version: {current_version} → {new_version} [ci skip]"
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\-(?P<pre>[a-z]+)\\.(?P<build>\\d+))?"
+parse = """(?x)
+    (?P<major>0|[1-9]\\d*)\\.
+    (?P<minor>0|[1-9]\\d*)\\.
+    (?P<patch>0|[1-9]\\d*)
+    (?:
+        \\.(?P<optional>0|[1-9]\\d*)  # pull request number (optional)
+    )?
+    (?:
+        -                             # dash separator for pre-release section
+        (?P<pre>[a-zA-Z-]+)\\.        # pre-release label
+        (?P<build>0|[1-9]\\d*)        # pre-release version number
+    )?                                # pre-release section is optional
+"""
 serialize = [
+	"{major}.{minor}.{patch}.{optional}-{pre}.{build}",
 	"{major}.{minor}.{patch}-{pre}.{build}",
 	"{major}.{minor}.{patch}"
 ]