something-x-dev 1.7.1.dev15__tar.gz → 1.8.0.dev19__tar.gz

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/.github/workflows/release-dev.yml

@@ -6,7 +6,7 @@ on:
 
 permissions:
   contents: write
-  id-token: write  # for PyPI OIDC trusted publishing
+  id-token: write
 
 jobs:
   release-dev:
@@ -18,54 +18,69 @@ jobs:
         with:
           fetch-depth: 0
 
-      # ── Get version from setuptools-scm ────────────────────────────────
-      # After tag v1.7.0, develop automatically produces 1.7.1.devN
-      - name: Get dev version
+      # ── Compute next version with python-semantic-release ───────────────
+      # PSR reads ALL commits since the last vX.Y.Z tag and applies the
+      # highest bump type (feat beats fix, breaking beats all).
+      # We strip PSR's own prerelease counter and use github.run_number instead.
+      - name: Compute dev version
         id: version
         run: |
-          pip install setuptools-scm
-          DEV_VERSION=$(python3 -m setuptools_scm)
+          pip install python-semantic-release
           SHORT_SHA=$(git rev-parse --short HEAD)
+
+          # --print: compute next version with no side effects
+          # On develop (prerelease=true in pyproject.toml) PSR outputs e.g. "1.8.0.dev1"
+          NEXT_PRE=$(semantic-release version --print 2>/dev/null || echo "")
+
+          if [ -n "$NEXT_PRE" ]; then
+            # Strip PSR's counter (.dev1 / -dev.1) — we use run_number instead
+            NEXT_BASE=$(echo "$NEXT_PRE" | sed -E 's/[.-]dev[.-]?[0-9]*//')
+            DEV_VERSION="${NEXT_BASE}.dev${{ github.run_number }}"
+          else
+            # No user-facing commits — still build, bump patch as fallback
+            LAST=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" 2>/dev/null | sed 's/^v//' || echo "0.0.0")
+            MAJOR=$(echo $LAST | cut -d. -f1)
+            MINOR=$(echo $LAST | cut -d. -f2)
+            PATCH=$(echo $LAST | cut -d. -f3)
+            DEV_VERSION="${MAJOR}.${MINOR}.$((PATCH+1)).dev${{ github.run_number }}"
+          fi
+
+          echo "Dev version: $DEV_VERSION  (sha: $SHORT_SHA)"
           echo "dev_version=$DEV_VERSION" >> $GITHUB_OUTPUT
           echo "short_sha=$SHORT_SHA"     >> $GITHUB_OUTPUT
-          echo "Dev version: $DEV_VERSION (sha: $SHORT_SHA)"
 
       # ── Patch package name for dev channel ─────────────────────────────
       - name: Patch package name
         run: |
           sed -i 's/^name\s*=\s*"something-x"/name            = "something-x-dev"/' pyproject.toml
           sed -i 's/^something-x = /something-x-dev = /' pyproject.toml
-          grep -E "^name|something-x" pyproject.toml
 
-      # ── Build wheel + sdist ─────────────────────────────────────────────
+      # ── Build ───────────────────────────────────────────────────────────
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
       - name: Build distribution
+        env:
+          SETUPTOOLS_SCM_PRETEND_VERSION: ${{ steps.version.outputs.dev_version }}
         run: |
           pip install build
           python -m build
           ls dist/
 
-      # ── Generate changelog with git-cliff ──────────────────────────────
-      - name: Install git-cliff
-        run: pip install git-cliff
-
+      # ── Release notes ───────────────────────────────────────────────────
       - name: Generate pre-release notes
         run: |
+          pip install git-cliff
           git cliff --unreleased --strip all 2>/dev/null > /tmp/cliff_body.md
-          if [ ! -s /tmp/cliff_body.md ]; then
-            echo "No user-facing changes since last release." > /tmp/cliff_body.md
-          fi
+          [ -s /tmp/cliff_body.md ] || echo "No user-facing changes since last release." > /tmp/cliff_body.md
 
           cat > /tmp/release_notes.md <<HEADER
           ## something-x-dev ${{ steps.version.outputs.dev_version }}
 
           > Pre-release build from \`develop\` — not for production use.
-
-          **Commit**: \`${{ steps.version.outputs.short_sha }}\`
+          > **Commit**: \`${{ steps.version.outputs.short_sha }}\`
 
           ### Changes since last stable release
 
@@ -74,12 +89,8 @@ jobs:
           cat >> /tmp/release_notes.md <<'FOOTER'
 
           ### Install
-
           ```bash
           pip install something-x-dev==${{ steps.version.outputs.dev_version }}
-
-          # Or download the wheel below
-          pip install something_x_dev-${{ steps.version.outputs.dev_version }}-py3-none-any.whl
           ```
           FOOTER
 
@@ -92,6 +103,6 @@ jobs:
           body_path: /tmp/release_notes.md
           files: dist/*
 
-      # ── Publish to PyPI (OIDC — requires trusted publisher configured) ──
+      # ── Publish to PyPI ─────────────────────────────────────────────────
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

something_x_dev-1.8.0.dev19/.github/workflows/release.yml

@@ -0,0 +1,122 @@
+name: Release
+
+on:
+  push:
+    branches: [main]
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.RELEASE_PAT }}
+
+      # ── Compute stable version with python-semantic-release ─────────────
+      # PSR reads ALL commits since last vX.Y.Z tag, highest bump wins.
+      # docs/chore/ci/test commits produce no output → release skipped.
+      - name: Compute release version
+        id: version
+        run: |
+          pip install python-semantic-release
+          NEW=$(semantic-release version --print 2>/dev/null || echo "")
+          if [ -z "$NEW" ]; then
+            echo "No releasable commits (docs/chore/style/ci/test only). Skipping."
+            echo "skip=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          echo "New version: $NEW"
+          echo "new=$NEW"    >> $GITHUB_OUTPUT
+          echo "skip=false"  >> $GITHUB_OUTPUT
+
+      # ── Tag and push ────────────────────────────────────────────────────
+      - name: Create and push release tag
+        if: steps.version.outputs.skip != 'true'
+        run: |
+          git config user.name  "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag "v${{ steps.version.outputs.new }}"
+          git push origin "v${{ steps.version.outputs.new }}"
+
+      # ── Build ───────────────────────────────────────────────────────────
+      - name: Set up Python
+        if: steps.version.outputs.skip != 'true'
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Build distribution
+        if: steps.version.outputs.skip != 'true'
+        env:
+          SETUPTOOLS_SCM_PRETEND_VERSION: ${{ steps.version.outputs.new }}
+        run: |
+          pip install build
+          python -m build
+          ls dist/
+
+      # ── Release notes ───────────────────────────────────────────────────
+      - name: Generate release notes
+        if: steps.version.outputs.skip != 'true'
+        run: |
+          pip install git-cliff
+          git cliff --latest --strip all 2>/dev/null > /tmp/cliff_body.md
+          [ -s /tmp/cliff_body.md ] || echo "No user-facing changes in this release." > /tmp/cliff_body.md
+
+          cat > /tmp/release_notes.md <<HEADER
+          ## Something X v${{ steps.version.outputs.new }}
+
+          HEADER
+          cat /tmp/cliff_body.md >> /tmp/release_notes.md
+          cat >> /tmp/release_notes.md <<'FOOTER'
+
+          ### Install
+          ```bash
+          # Arch / Omarchy
+          sudo pacman -S python-gobject python-cairo gtk4 libadwaita
+          pip install something-x==${{ steps.version.outputs.new }}
+          ```
+          FOOTER
+
+      # ── GitHub Release ──────────────────────────────────────────────────
+      - name: Create GitHub Release
+        if: steps.version.outputs.skip != 'true'
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: "v${{ steps.version.outputs.new }}"
+          body_path: /tmp/release_notes.md
+          files: dist/*
+
+      # ── Publish to PyPI ─────────────────────────────────────────────────
+      - name: Publish to PyPI
+        if: steps.version.outputs.skip != 'true'
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+      # ── Update AUR ──────────────────────────────────────────────────────
+      - name: Update PKGBUILD
+        if: steps.version.outputs.skip != 'true'
+        env:
+          NEW_VERSION: ${{ steps.version.outputs.new }}
+        run: |
+          SHA256=$(sha256sum dist/something_x-${NEW_VERSION}.tar.gz | awk '{print $1}')
+          sed -i "s/^pkgver=.*/pkgver=${NEW_VERSION}/" PKGBUILD
+          sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD
+          sed -i "s/sha256sums=('[^']*')/sha256sums=('${SHA256}')/" PKGBUILD
+
+      - name: Deploy to AUR
+        if: steps.version.outputs.skip != 'true'
+        uses: KSXGitHub/github-actions-deploy-aur@v3.0.1
+        with:
+          pkgname: something-x
+          pkgbuild: ./PKGBUILD
+          commit_username: github-actions[bot]
+          commit_email: github-actions[bot]@users.noreply.github.com
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: "Update to ${{ steps.version.outputs.new }}"
+          allow_empty_commits: false

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.7.1.dev15
+Version: 1.8.0.dev19
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/nothing_app/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.7.1.dev15'
-__version_tuple__ = version_tuple = (1, 7, 1, 'dev15')
+__version__ = version = '1.8.0.dev19'
+__version_tuple__ = version_tuple = (1, 8, 0, 'dev19')
 
-__commit_id__ = commit_id = 'g3b2a859'
+__commit_id__ = commit_id = None

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/nothing_app/window.py

@@ -34,7 +34,6 @@ class SomethingXWindow(Adw.ApplicationWindow):
         nd = NothingDevice(address)
         self._nothing_devices[path] = nd
         nd.connect_rfcomm()
-        print(f"[window] autoconnect RFCOMM → {address}")
 
     def _on_bt_connected(self, _mgr, path: str):
         dev = self._bt.devices.get(path)

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/pyproject.toml

@@ -53,6 +53,27 @@ version_scheme        = "guess-next-dev"
 local_scheme          = "no-local-version"
 version_file          = "nothing_app/_version.py"
 
+[tool.semantic_release]
+# Version is tag-only — PSR reads from the last vX.Y.Z tag and writes a new tag.
+# No version_toml / version_variables → no file modifications.
+tag_format             = "v{version}"
+commit_version_number  = false
+commit_message         = ""
+
+[tool.semantic_release.branches.main]
+match      = "main"
+prerelease = false
+
+[tool.semantic_release.branches.develop]
+match             = "develop"
+prerelease        = true
+prerelease_token  = "dev"
+
+[tool.semantic_release.commit_parser_options]
+major_tags  = ["BREAKING CHANGE"]
+minor_tags  = ["feat"]
+patch_tags  = ["fix", "perf", "refactor"]
+
 [tool.ruff]
 line-length = 110
 

{something_x_dev-1.7.1.dev15 → something_x_dev-1.8.0.dev19}/something_x_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.7.1.dev15
+Version: 1.8.0.dev19
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT

something_x_dev-1.7.1.dev15/.github/workflows/release.yml

@@ -1,190 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [main]
-
-permissions:
-  contents: write
-  id-token: write  # for PyPI OIDC trusted publishing
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.RELEASE_PAT }}
-
-      # ── Determine version bump from conventional commit ─────────────────
-      - name: Parse commit and bump version
-        id: version
-        run: |
-          COMMIT_MSG=$(git log -1 --pretty=%B)
-          echo "Commit: $COMMIT_MSG"
-
-          # Read current version from last vX.Y.Z tag (not pyproject.toml)
-          CURRENT=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" 2>/dev/null | sed 's/^v//')
-          if [ -z "$CURRENT" ]; then
-            CURRENT="0.0.0"
-          fi
-          echo "Current version (last tag): $CURRENT"
-
-          MAJOR=$(echo $CURRENT | cut -d. -f1)
-          MINOR=$(echo $CURRENT | cut -d. -f2)
-          PATCH=$(echo $CURRENT | cut -d. -f3)
-
-          if echo "$COMMIT_MSG" | grep -qE "(^(feat|fix|refactor|perf)!:)|(BREAKING CHANGE:)"; then
-            BUMP=major
-            MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0
-          elif echo "$COMMIT_MSG" | grep -qE "^feat(\([^)]+\))?:"; then
-            BUMP=minor
-            MINOR=$((MINOR + 1)); PATCH=0
-          elif echo "$COMMIT_MSG" | grep -qE "^(fix|perf|refactor)(\([^)]+\))?:"; then
-            BUMP=patch
-            PATCH=$((PATCH + 1))
-          else
-            echo "Commit type does not trigger a release (docs/chore/style/ci/test). Skipping."
-            echo "skip=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          NEW="$MAJOR.$MINOR.$PATCH"
-          echo "Bump: $BUMP  →  $CURRENT → $NEW"
-          echo "current=$CURRENT" >> $GITHUB_OUTPUT
-          echo "new=$NEW"         >> $GITHUB_OUTPUT
-          echo "bump=$BUMP"       >> $GITHUB_OUTPUT
-          echo "skip=false"       >> $GITHUB_OUTPUT
-
-      # ── Tag and push (no pyproject.toml commit needed) ──────────────────
-      - name: Create and push release tag
-        if: steps.version.outputs.skip != 'true'
-        run: |
-          git config user.name  "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag "v${{ steps.version.outputs.new }}"
-          git push origin "v${{ steps.version.outputs.new }}"
-
-      # ── Generate changelog with git-cliff ──────────────────────────────
-      - name: Install git-cliff
-        if: steps.version.outputs.skip != 'true'
-        run: pip install git-cliff
-
-      - name: Generate release notes
-        if: steps.version.outputs.skip != 'true'
-        run: |
-          # --latest: commits from the previous vX.Y.Z tag up to the tag we just pushed
-          # cliff.toml: skips merge commits, ignores dev-* tags, filters to conventional commits
-          git cliff --latest --strip all 2>/dev/null > /tmp/cliff_body.md
-          if [ ! -s /tmp/cliff_body.md ]; then
-            echo "No user-facing changes in this release." > /tmp/cliff_body.md
-          fi
-
-          # Prepend the header + install block; cliff body goes in the middle
-          cat > /tmp/release_notes.md <<HEADER
-          ## Something X v${{ steps.version.outputs.new }}
-
-          HEADER
-          cat /tmp/cliff_body.md >> /tmp/release_notes.md
-          cat >> /tmp/release_notes.md <<'FOOTER'
-
-          ### Install
-
-          ```bash
-          # Arch / Omarchy (recommended)
-          sudo pacman -S python-gobject python-dbus python-cairo gtk4 libadwaita
-          pip install something-x==${{ steps.version.outputs.new }}
-
-          # Or download the wheel below
-          pip install something_x-${{ steps.version.outputs.new }}-py3-none-any.whl
-          ```
-          FOOTER
-
-          echo "--- Release notes preview ---"
-          cat /tmp/release_notes.md
-
-      # ── Build wheel + sdist ─────────────────────────────────────────────
-      - name: Set up Python
-        if: steps.version.outputs.skip != 'true'
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Build distribution
-        if: steps.version.outputs.skip != 'true'
-        run: |
-          pip install build
-          python -m build
-          ls dist/
-
-      # ── Generate changelog with git-cliff ──────────────────────────────
-      - name: Install git-cliff
-        if: steps.version.outputs.skip != 'true'
-        run: pip install git-cliff
-
-      - name: Generate release notes
-        if: steps.version.outputs.skip != 'true'
-        run: |
-          git cliff --latest --strip all 2>/dev/null > /tmp/cliff_body.md
-          if [ ! -s /tmp/cliff_body.md ]; then
-            echo "No user-facing changes in this release." > /tmp/cliff_body.md
-          fi
-
-          cat > /tmp/release_notes.md <<HEADER
-          ## Something X v${{ steps.version.outputs.new }}
-
-          HEADER
-          cat /tmp/cliff_body.md >> /tmp/release_notes.md
-          cat >> /tmp/release_notes.md <<'FOOTER'
-
-          ### Install
-
-          ```bash
-          # Arch / Omarchy (recommended)
-          sudo pacman -S python-gobject python-cairo gtk4 libadwaita
-          pip install something-x==${{ steps.version.outputs.new }}
-
-          # Or download the wheel below
-          pip install something_x-${{ steps.version.outputs.new }}-py3-none-any.whl
-          ```
-          FOOTER
-
-      # ── GitHub Release ──────────────────────────────────────────────────
-      - name: Create GitHub Release
-        if: steps.version.outputs.skip != 'true'
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: "v${{ steps.version.outputs.new }}"
-          body_path: /tmp/release_notes.md
-          files: dist/*
-
-      # ── Publish to PyPI (OIDC trusted publisher) ────────────────────────
-      - name: Publish to PyPI
-        if: steps.version.outputs.skip != 'true'
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-      # ── Update AUR package ──────────────────────────────────────────────
-      - name: Update PKGBUILD and push to AUR
-        if: steps.version.outputs.skip != 'true'
-        env:
-          NEW_VERSION: ${{ steps.version.outputs.new }}
-        run: |
-          SHA256=$(sha256sum dist/something_x-${NEW_VERSION}.tar.gz | awk '{print $1}')
-          sed -i "s/^pkgver=.*/pkgver=${NEW_VERSION}/" PKGBUILD
-          sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD
-          sed -i "s/sha256sums=('[^']*')/sha256sums=('${SHA256}')/" PKGBUILD
-
-      - name: Deploy to AUR
-        if: steps.version.outputs.skip != 'true'
-        uses: KSXGitHub/github-actions-deploy-aur@v3.0.1
-        with:
-          pkgname: something-x
-          pkgbuild: ./PKGBUILD
-          commit_username: github-actions[bot]
-          commit_email: github-actions[bot]@users.noreply.github.com
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to ${{ steps.version.outputs.new }}"
-          allow_empty_commits: false