Merge pull request #772 from plugwise/pypifix

Fully match version

Author: CoMPaTech

.github/workflows/merge.yml

@@ -40,12 +40,9 @@ jobs:
           PACKAGE_VERSION=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])")
           PACKAGE_NAME=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])")
 
-          # Use jq to check for the version in the releases object
-          EXISTING_VERSIONS=$(curl -s "https://pypi.org/pypi/$PACKAGE_NAME/json" | jq '.releases | keys[]')
-
           echo "Checking for package: $PACKAGE_NAME==$PACKAGE_VERSION"
 
-          if [[ "$EXISTING_VERSIONS" =~ "$PACKAGE_VERSION" ]]; then
+          if curl -s "https://pypi.org/pypi/$PACKAGE_NAME/json" | jq -r '.releases | keys[]' | grep -q "^$PACKAGE_VERSION$"; then
             echo "Package version already exists. Skipping upload."
             echo "should_publish=false" >> $GITHUB_OUTPUT
           else

.github/workflows/verify.yml

@@ -261,13 +261,9 @@ jobs:
           . venv/bin/activate
           PACKAGE_VERSION=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])")
           PACKAGE_NAME=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])")
-
-          # Use jq to check for the version in the releases object
-          EXISTING_VERSIONS=$(curl -s "https://test.pypi.org/pypi/$PACKAGE_NAME/json" | jq '.releases | keys[]')
-
           echo "Checking for package: $PACKAGE_NAME==$PACKAGE_VERSION"
 
-          if [[ "$EXISTING_VERSIONS" =~ "$PACKAGE_VERSION" ]]; then
+          if curl -s "https://test.pypi.org/pypi/$PACKAGE_NAME/json" | jq -r '.releases | keys[]' | grep -q "^$PACKAGE_VERSION$"; then
             echo "Package version already exists. Skipping upload."
             echo "should_publish=false" >> $GITHUB_OUTPUT
           else