Merge pull request #931 from Avaiga/backport-3.1

Backport 3.1

.github/workflows/build-and-release.yml

@@ -11,6 +11,9 @@ on:
         description: "The type of release to be made (dev or production)"
         default: "dev"
         required: true
+      target_version:
+        description: "The version of the package to be released"
+        required: true
 
 jobs:
   fetch-versions:
@@ -25,10 +28,15 @@ jobs:
         NEW_VERSION: ${{ steps.version-setup.outputs.NEW_VERSION }}
     steps:
       - uses: actions/checkout@v4
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
       - name: Setup Version
         id: version-setup
         run: |
-          python tools/release/setup_version.py ALL ${{ github.event.inputs.release_type }} ${{ github.event.inputs.version }} ${{ steps.extract_branch.outputs.branch }} >> $GITHUB_OUTPUT
+          python tools/release/setup_version.py ALL ${{ github.event.inputs.release_type }} ${{ github.event.inputs.target_version }} ${{ steps.extract_branch.outputs.branch }} >> $GITHUB_OUTPUT
 
   build-and-release-taipy-packages:
     needs: [fetch-versions]

taipy/config/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

taipy/core/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

taipy/gui/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

taipy/rest/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

taipy/templates/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

taipy/version.json

@@ -1 +1 @@
-{"major": 3, "minor": 1, "patch": 0, "ext": "dev3"}
+{"major": 3, "minor": 2, "patch": 0, "ext": "dev0"}

tools/release/setup_version.py

@@ -22,7 +22,7 @@ class Version:
     major: str
     minor: str
     patch: str
-    ext: str
+    ext: Optional[str] = None
 
     def bump_ext_version(self) -> None:
         if not self.ext: