feat: enhance smart grouping dependency handling

.github/workflows/auto-release.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
           # Check if commit message indicates a version bump
           COMMIT_MSG=$(git log -1 --pretty=%B)
-          if [[ "$COMMIT_MSG" == *"bump version"* ]]; then
+          if [[ "$COMMIT_MSG" =~ [Bb][Uu][Mm][Pp]\ [Vv][Ee][Rr][Ss][Ii][Oo][Nn] ]]; then
             echo "should_release=true" >> $GITHUB_OUTPUT
             echo "Version bump detected, should create release"
           else
@@ -66,14 +66,16 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ needs.check-version-bump.outputs.version }}
-          name: Release v${{ needs.check-version-bump.outputs.version }}
+          release_name: Release v${{ needs.check-version-bump.outputs.version }}
           body: ${{ needs.check-version-bump.outputs.changelog }}
           draft: false
           prerelease: false
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Output Release Status
         run: echo "Release for v${{ needs.check-version-bump.outputs.version }} created successfully"

.github/workflows/ci.yml

@@ -11,94 +11,64 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-3.11-${{ hashFiles('**/poetry.lock') }}
+          enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
 
       - name: Install dependencies
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
-
-      - name: Install project
         run: |
-          poetry install --no-interaction
-          poetry run pip install -e .
-
+          uv sync --all-extras --dev
+
       - name: Check code formatting
         run: |
-          source .venv/bin/activate
-          poetry run ruff format .
+          uv run ruff format --check .
 
       - name: Run linter
         run: |
-          source .venv/bin/activate
-          poetry run ruff check .
+          uv run ruff check .
 
       - name: Type check
         run: |
-          source .venv/bin/activate
-          poetry run mypy commitloom tests
+          uv run mypy commitloom tests
 
   test:
     name: Test
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+          enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
 
       - name: Install dependencies
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
-
-      - name: Install project
         run: |
-          poetry install --no-interaction
-          poetry run pip install -e .
+          uv sync --all-extras --dev
 
       - name: Run tests
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
         run: |
-          source .venv/bin/activate
-          poetry run pytest --cov=commitloom --cov-report=xml
+          uv run pytest --cov=commitloom --cov-report=xml
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
@@ -110,22 +80,22 @@ jobs:
     name: Build Package
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
+          enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
 
       - name: Build package
-        run: poetry build
+        run: |
+          uv build
 
       - name: Check dist contents
         run: |

.github/workflows/manual-publish.yml

@@ -0,0 +1,75 @@
+name: Manual Publish to PyPI
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (without v prefix, e.g. 1.2.5)'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  manual-publish:
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+
+      - name: Verify version matches
+        run: |
+          VERSION=$(grep -m 1 "^version = " pyproject.toml | sed 's/version = "\(.*\)"/\1/')
+          echo "Version in pyproject.toml: $VERSION"
+          echo "Version requested: ${{ github.event.inputs.version }}"
+          if [ "$VERSION" != "${{ github.event.inputs.version }}" ]; then
+            echo "::error::Version mismatch! pyproject.toml has $VERSION but requested ${{ github.event.inputs.version }}"
+            exit 1
+          fi
+
+      - name: Install dependencies
+        run: uv sync --all-extras --dev
+
+      - name: Build package (uv)
+        run: uv build
+
+      - name: Verify distribution files
+        run: |
+          echo "Generated distribution files:"
+          ls -la dist/
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
+          packages-dir: dist/
+          verbose: true
+
+      - name: Verify publication
+        run: |
+          echo "Waiting for PyPI to index the package..."
+          sleep 30
+
+          # Use uv to verify the version is available
+          uv pip install commitloom==${{ github.event.inputs.version }} --no-deps
+          INSTALLED_VERSION=$(uv run python -c "import commitloom; print(commitloom.__version__)")
+
+          echo "Installed version: $INSTALLED_VERSION"
+          if [ "$INSTALLED_VERSION" == "${{ github.event.inputs.version }}" ]; then
+            echo "✅ Publication successful!"
+          else
+            echo "⚠️ Publication may have failed or not indexed yet"
+          fi

.github/workflows/publish.yml

@@ -9,27 +9,76 @@
 name: Upload Python Package
 
 on:
-  release:
-    types: [published, created]
+  workflow_run:
+    workflows: ["Auto Release"]
+    types:
+      - completed
 
 permissions:
   contents: read
 
 jobs:
+  check-workflow:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    outputs:
+      version: ${{ steps.get-version.outputs.version }}
+      should_publish: ${{ steps.check-release.outputs.should_publish }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.workflow_run.head_branch }}
+
+      - name: Get version from pyproject.toml
+        id: get-version
+        run: |
+          VERSION=$(grep -m 1 "^version = " pyproject.toml | sed 's/version = "\(.*\)"/\1/')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Current version: $VERSION"
+
+      - name: Check if release should be published
+        id: check-release
+        run: |
+          # Check if most recent commit was a version bump
+          COMMIT_MSG=$(git log -1 --pretty=%B)
+          if [[ "$COMMIT_MSG" =~ [Bb][Uu][Mm][Pp]\ [Vv][Ee][Rr][Ss][Ii][Oo][Nn] ]]; then
+            echo "should_publish=true" >> $GITHUB_OUTPUT
+            echo "Version bump detected, should publish to PyPI"
+          else
+            echo "should_publish=false" >> $GITHUB_OUTPUT
+            echo "Not a version bump commit, skipping PyPI publishing"
+          fi
+
+      - name: Debug workflow info
+        run: |
+          echo "Auto-Release workflow completed successfully"
+          echo "Version to publish: ${{ steps.get-version.outputs.version }}"
+          echo "Should publish: ${{ steps.check-release.outputs.should_publish }}"
+
   release-build:
     runs-on: ubuntu-latest
+    needs: check-workflow
+    if: ${{ needs.check-workflow.outputs.should_publish == 'true' }}
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.x"
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
 
       - name: Build release distributions
         run: |
-          python -m pip install build
-          python -m build
+          uv build
 
       - name: Upload distributions
         uses: actions/upload-artifact@v4
@@ -40,7 +89,9 @@ jobs:
   pypi-publish:
     runs-on: ubuntu-latest
     needs:
+      - check-workflow
       - release-build
+    if: ${{ needs.check-workflow.outputs.should_publish == 'true' }}
     environment:
       name: pypi
 
@@ -55,4 +106,9 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_TOKEN }}
-          packages-dir: dist/
+          packages-dir: dist/
+          verbose: true
+
+      - name: Publish success
+        run: |
+          echo "✅ Successfully published version ${{ needs.check-workflow.outputs.version }} to PyPI"

.gitignore

@@ -16,6 +16,7 @@ build/
 develop-eggs/
 dist/
 downloads/
+docs/
 eggs/
 .eggs/
 lib/
@@ -48,6 +49,7 @@ htmlcov/
 .coverage.*
 .cache
 nosetests.xml
+CLAUDE.md
 coverage.xml
 *.cover
 *.py,cover