CU-8699rg5cc: Add new workflow to publish to PyPI using TPM (#40)

* CU-8699rg5cc: Add new workflow to publish to PyPI using TPM

* CU-8699rg5cc: Allow beta/alpha release versions in release scripts

* CU-8699rg5cc: Make patch releases work with alpha/beta/release candidate

* CU-8699rg5cc: Use a better check for patch/minor releases

* CU-8699rg5cc: Fix patch release getter to work on MacOS and Linux

* CU-8699rg5cc: Fix patch and minor release distribution

* CU-8699rg5cc: Remove debug output

Author: mart-r

.github/workflows/medcat-v2_release.yml

@@ -202,11 +202,7 @@ jobs:
           files: |
             medcat-v2/dist/*
 
-      # Uncomment and modify this for PyPI publishing in the future
-      # - name: Publish to PyPI
-      #   if: false # Set to `true` or remove when ready
-      #   env:
-      #     PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-      #   run: |
-      #     pip install --upgrade twine
-      #     twine upload dist/*
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: medcat-v2/dist

medcat-v2/.release/prepare_minor_release.sh

@@ -19,15 +19,16 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
-if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: version '$VERSION' must be in format X.Y.Z"
+if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+([ab]|rc)?[0-9]*$ ]]; then
+    echo "Error: version '$VERSION' must be in format X.Y.Z or X.Y.Z<pre><n> (e.g 2.0.0b0)"
     exit 1
 fi
 VERSION_TAG="medcat/v$VERSION"
 
 # Extract version components
 VERSION_MAJOR_MINOR="${VERSION%.*}"
-VERSION_PATCH="${VERSION##*.}"
+# work with alpha/beta/rc
+VERSION_PATCH="$(echo "$VERSION" | sed -E 's/^[0-9]+\.[0-9]+\.([0-9]+).*/\1/')"
 RELEASE_BRANCH="medcat/v$VERSION_MAJOR_MINOR"
 
 # Helpers

medcat-v2/.release/prepare_patch_release.sh

@@ -42,15 +42,16 @@ while (( "$#" )); do
     esac
 done
 
-if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: version '$VERSION' must be in format X.Y.Z"
+if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+([ab]|rc)?[0-9]*$ ]]; then
+    echo "Error: version '$VERSION' must be in format X.Y.Z or X.Y.Z<pre><n> (e.g 2.0.0b0)"
     exit 1
 fi
 VERSION_TAG="medcat/v$VERSION"
 
 # Extract version components
 VERSION_MAJOR_MINOR="${VERSION%.*}"
-VERSION_PATCH="${VERSION##*.}"
+# work with alpha/beta/rc
+VERSION_PATCH="$(echo "$VERSION" | sed -E 's/^[0-9]+\.[0-9]+\.([0-9]+).*/\1/')"
 RELEASE_BRANCH="medcat/v$VERSION_MAJOR_MINOR"
 
 # some prerequisites

medcat-v2/.release/prepare_release.sh

@@ -46,20 +46,17 @@ while [[ $# -gt 0 ]]; do
 done
 
 
-if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: version '$VERSION' must be in format X.Y.Z"
+if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+([ab]|rc)?[0-9]*$ ]]; then
+    echo "Error: version '$VERSION' must be in format X.Y.Z or X.Y.Z<pre><n> (e.g 2.0.0b0)"
     exit 1
 fi
 
 IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
 
-if [[ "$PATCH" == "0" ]]; then
-    cmd=("$SCRIPT_DIR/prepare_minor_release.sh" "$VERSION")
-    if [[ ${#EXTRA_FLAGS[@]} -gt 0 ]]; then
-        cmd+=("${EXTRA_FLAGS[@]}")
-    fi
-    echo "Preparing minor release $VERSION"
-else
+MINOR_SERIES="v$MAJOR.$MINOR"
+
+if git show-ref --verify --quiet "refs/remotes/origin/medcat/$MINOR_SERIES"; then
+    echo "Branch 'medcat/$MINOR_SERIES' exists – patch release"
     cmd=("$SCRIPT_DIR/prepare_patch_release.sh" "$VERSION")
     # Add extra flags only if they exist
     if [[ ${#EXTRA_FLAGS[@]} -gt 0 ]]; then
@@ -70,5 +67,12 @@ else
         cmd+=("${CHERRY_PICK_HASHES[@]}")
     fi
     echo "Preparing patch release $VERSION"
+else
+    echo "Branch 'medcat/$MINOR_SERIES' does not exist – minor release"
+    cmd=("$SCRIPT_DIR/prepare_minor_release.sh" "$VERSION")
+    if [[ ${#EXTRA_FLAGS[@]} -gt 0 ]]; then
+        cmd+=("${EXTRA_FLAGS[@]}")
+    fi
+    echo "Preparing minor release $VERSION"
 fi
 bash "${cmd[@]}"