Release 2.42.1

.github/configs/version_control.json

@@ -1,5 +1,5 @@
 {
-  "current_version": "2.42.0",
-  "previous_version": "2.42.0dev1",
-  "last_stable_release": "2.42.0"
+  "current_version": "2.42.1",
+  "previous_version": "2.42.1dev1",
+  "last_stable_release": "2.42.1"
 }

.github/workflows/ci.yml

@@ -3,7 +3,8 @@ run-name: Continuous integration
 
 on:
   pull_request:
-    branches: ["dev"]
+    branches: 
+      - dev
 
 jobs:
   dependency_review:

.github/workflows/labler.yml

@@ -3,7 +3,8 @@ run-name: Labler
 
 on:
   pull_request:
-    types: [opened]
+    types: 
+      - opened
 
 jobs:
   pr_labeler:

.github/workflows/release.yml

@@ -116,44 +116,33 @@ jobs:
         run: git tag -a ${{ inputs.new_tags }} -m "Release ${{ inputs.new_tags }}"
 
       - name: Bump subsearch version 
-        run: |
-          ${{ env.CLI}} python --write-string ${{ inputs.new_tags }}
-          git add ${{ env.VERSION_PY_PATH }}
-          git commit -S -m "Bump version ${{ steps.version.outputs.version }} → ${{ inputs.new_tags }}"
+        run: ${{ env.CLI}} python --write-string ${{ inputs.new_tags }}
+
 
       - name: Bump current version
-        run: |
-          ${{ env.CLI }} json -w current_version ${{ inputs.new_tags }}
-          git add ${{ env.VERSION_CONTROL_PATH }} 
-          git commit -S -m "Bump current version ${{ needs.init.outputs.current_tags }} → ${{ inputs.new_tags }}" 
+        run: ${{ env.CLI }} json -w current_version ${{ inputs.new_tags }}
+
 
       - name: Bump previous version
-        run: |
-          ${{ env.CLI }} json -w previous_version ${{ needs.init.outputs.current_tags }}
-          git add ${{ env.VERSION_CONTROL_PATH }} 
-          git commit -S -m "Bump previous version ${{ needs.init.outputs.previous_tags }} → ${{ needs.init.outputs.current_tags }}"
+        run: ${{ env.CLI }} json -w previous_version ${{ needs.init.outputs.current_tags }}
+
 
       - name: Bump last stable release
         if: ${{ !contains(inputs.new_tags, 'dev')  }}
-        run: |
-          ${{ env.CLI }} json -w last_stable_release ${{ inputs.new_tags }}
-          git add ${{ env.VERSION_CONTROL_PATH }} 
-          git commit -S -m "Bump last stable release ${{ needs.init.outputs.last_stable_release }} → ${{ inputs.new_tags }}"
+        run: ${{ env.CLI }} json -w last_stable_release ${{ inputs.new_tags }}
 
-      - name: Push stable 
-        if: ${{ !contains(inputs.new_tags, 'dev')  }}
+      - name: Push commits
         run: |
           git status
           git fetch origin ${{ github.ref_name }}
+          git add ${{ env.VERSION_PY_PATH }} ${{ env.VERSION_CONTROL_PATH }} 
+          git commit -S -m "Bump version to ${{ inputs.new_tags }}"
           git push origin HEAD:${{ github.ref_name }}
-          git push origin --tags
-
-      - name: Push develop
-        if: ${{ contains(inputs.new_tags, 'dev')  }}
+
+      - name: Push tags
+        if: ${{ !contains(inputs.new_tags, 'dev')  }}
         run: |
-          git status
-          git fetch origin ${{ github.ref_name }}
-          git push origin HEAD:${{ github.ref_name }}
+          git push origin --tags
 
   build_binaries:
     name: Build binaries
@@ -178,7 +167,9 @@ jobs:
         run: |
           git fetch origin ${{ github.ref_name }}
           python -m pip install --upgrade pip
-          pip install -e .[whl_cp312]
+          pip install -e .
+          pip install --force --no-cache --pre --extra-index-url https://marcelotduarte.github.io/packages/ cx_Freeze
+          pip install build psutil
           python -m tools.build bdist_msi
 
       - name: Create hashes file and set outputs
@@ -398,6 +389,6 @@ jobs:
         git fetch --all
         $changelogContent = Get-Content -Raw "artifacts\changelog_${{ env.ID }}\${{ env.CHANGELOG_NAME }}"
         gh pr create --base main --head dev --title "Release ${{ inputs.new_tags }}" --body "$changelogContent" --base main
-        gh pr merge --squash --auto
+        gh pr merge --squash --auto --subject "Release ${{ inputs.new_tags }}t" --body "$changelogContent"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -86,7 +86,7 @@ Requires Python *3.10+
 - Build the executable and MSI installer by running `python -m tools.cx_freeze_build bdist_msi`.
 
 > [!IMPORTANT]  
-> ###### For Python 3.12+ use pip install -e .[`whl_cp312`...] instead of `build` if you're planning on building the msi/executble yourself, more info [here](https://github.com/marcelotduarte/cx_Freeze/issues/2153).
+> ###### If you are using Python 3.12+ and cx_Freeze, please refer to [this issue](https://github.com/marcelotduarte/cx_Freeze/issues/2153).
 
 #### Windows installer <a name = "msi"></a>
 
@@ -98,7 +98,7 @@ Requires windows 10/11, probably works on 8.
 - Run Subsearch at least once for all the context menu options to appear
 
 > [!NOTE]  
-> ###### Development builds are typically accessible for a minimum of 7 days. You can locate them from [release.yml](https://github.com/vagabondHustler/subsearch/actions/workflows/release.yml) within the artifacts generated by the associated GitHub Action.
+> ###### Development builds can be located in the [release](https://github.com/vagabondHustler/subsearch/actions/workflows/release.yml) action job, within the generated artifacts.
 
 <details>
 <summary>Screenshots of PUA message<a name = "pua"></a></summary>

pyproject.toml

@@ -74,20 +74,12 @@
         "twine==4.0.2",
         "psutil==5.9.8",
     ]
-    whl_cp312 = [
-        "build==1.0.3",
-        "cx_Freeze @ https://marcelotduarte.github.io/packages/cx-freeze/cx_Freeze-6.16.0.dev22-cp312-cp312-win_amd64.whl",
-        "cx_Logging @ https://marcelotduarte.github.io/packages/cx-logging/cx_Logging-3.1.0-cp312-cp312-win_amd64.whl",
-        "lief @ https://marcelotduarte.github.io/packages/lief/lief-0.15.0-cp312-cp312-win_amd64.whl",
-        "twine==4.0.2",
-        "psutil==5.9.8",
-    ]
     lint = ["black==23.12.1", "isort==5.13.2"]
     tests = [
         "pytest-cov==4.1.0",
         "pytest==7.4.4",
         "tox==4.12.1",
-        "python-dotenv==1.0.0",
+        "python-dotenv==1.0.1",
     ]
     tools = ["pyperclip==1.8.2"]
     type = ["mypy==1.8.0"]

src/subsearch/data/version.py

@@ -1 +1 @@
-__version__ = "2.42.0"
+__version__ = "2.42.1"