Merge branch 'main' of github.com:axonops/async-python-cassandra-client into bulk

Author: millerjp

.github/workflows/ci-monorepo.yml

@@ -36,13 +36,19 @@ jobs:
 
     - name: Install dependencies
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        echo "=== DEBUG: Installing dependencies ==="
+        echo "Package: ${{ inputs.package }}"
+        echo "Install path: ./libs/${{ inputs.package }}"
+        echo "Current directory: $(pwd)"
+        echo "Checking if path exists:"
+        ls -la ./libs/${{ inputs.package }}/
+        echo "=== Running pip install ==="
         python -m pip install --upgrade pip
-        pip install -e ".[dev]"
+        pip install -e "./libs/${{ inputs.package }}[dev]"
 
     - name: Run linting checks
+      working-directory: libs/${{ inputs.package }}
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         echo "=== Running ruff ==="
         ruff check src/ tests/
         echo "=== Running black ==="
@@ -71,8 +77,8 @@ jobs:
         pip install bandit[toml] safety pip-audit
 
     - name: Run Bandit security scan
+      working-directory: libs/${{ inputs.package }}
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         echo "=== Running Bandit security scan ==="
         # Run bandit with config file and capture exit code
         bandit -c ../../.bandit -r src/ -f json -o bandit-report.json || BANDIT_EXIT=$?
@@ -95,9 +101,8 @@ jobs:
 
     - name: Check dependencies with Safety
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         echo "=== Checking dependencies with Safety ==="
-        pip install -e ".[dev,test]"
+        pip install -e "./libs/${{ inputs.package }}[dev,test]"
         # Using the new 'scan' command as 'check' is deprecated
         safety scan --json || SAFETY_EXIT=$?
         # Safety scan exits with 64 if vulnerabilities found
@@ -108,7 +113,7 @@ jobs:
 
     - name: Run pip-audit
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Running pip-audit ==="
         # Skip the local package as it's not on PyPI yet
         pip-audit --skip-editable
@@ -136,13 +141,12 @@ jobs:
 
     - name: Install dependencies
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         python -m pip install --upgrade pip
-        pip install -e ".[test]"
+        pip install -e "./libs/${{ inputs.package }}[test]"
 
     - name: Run unit tests with coverage
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         pytest tests/unit/ -v --cov=${{ inputs.package == 'async-cassandra' && 'async_cassandra' || 'async_cassandra_bulk' }} --cov-report=html --cov-report=xml || echo "No unit tests found (expected for new packages)"
 
   build:
@@ -165,21 +169,21 @@ jobs:
 
     - name: Build package
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Building package ==="
         python -m build
         echo "=== Package contents ==="
         ls -la dist/
 
     - name: Check package with twine
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Checking package metadata ==="
         twine check dist/*
 
     - name: Display package info
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Wheel contents ==="
         python -m zipfile -l dist/*.whl | head -20
         echo "=== Package metadata ==="
@@ -241,9 +245,8 @@ jobs:
 
     - name: Install dependencies
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         python -m pip install --upgrade pip
-        pip install -e ".[test,dev]"
+        pip install -e "./libs/${{ inputs.package }}[test,dev]"
 
     - name: Verify Cassandra is ready
       run: |
@@ -258,7 +261,7 @@ jobs:
         CASSANDRA_HOST: localhost
         CASSANDRA_PORT: 9042
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Running ${{ matrix.test-suite.name }} ==="
         ${{ matrix.test-suite.command }}
 
@@ -305,9 +308,8 @@ jobs:
 
     - name: Install dependencies
       run: |
-        cd ${{ env.PACKAGE_DIR }}
         python -m pip install --upgrade pip
-        pip install -e ".[test,dev]"
+        pip install -e "./libs/${{ inputs.package }}[test,dev]"
 
     - name: Verify Cassandra is ready
       run: |
@@ -322,7 +324,7 @@ jobs:
         CASSANDRA_HOST: localhost
         CASSANDRA_PORT: 9042
       run: |
-        cd ${{ env.PACKAGE_DIR }}
+        cd libs/${{ inputs.package }}
         echo "=== Running ${{ matrix.test-suite.name }} ==="
         ${{ matrix.test-suite.command }}
 

.github/workflows/release-monorepo.yml

@@ -162,7 +162,7 @@ jobs:
     needs: [determine-package, build-package]
     runs-on: ubuntu-latest
     # Only publish stable versions (no pre-release suffix)
-    if: "!contains(needs.determine-package.outputs.version, '-')"
+    if: "!contains(needs.determine-package.outputs.version, 'rc') && !contains(needs.determine-package.outputs.version, 'a') && !contains(needs.determine-package.outputs.version, 'b') && !contains(needs.determine-package.outputs.version, 'dev')"
 
     permissions:
       id-token: write  # Required for trusted publishing

.github/workflows/release.yml

@@ -3,19 +3,55 @@ name: Release CI (Legacy)
 on:
   push:
     tags:
-      # Legacy tags - redirect to new monorepo release
-      - 'v[0-9]*'
+      # Legacy tags only - must start with v followed by version number
+      - 'v[0-9].*'
+      - '!async-cassandra-v*'
+      - '!async-cassandra-bulk-v*'
 
 jobs:
   full-ci:
-    uses: ./.github/workflows/ci-base.yml
+    uses: ./.github/workflows/ci-monorepo.yml
     with:
+      package: async-cassandra
       run-integration-tests: true
       run-full-suite: true
 
+  build-package:
+    needs: full-ci
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build twine
+
+      - name: Build package
+        run: |
+          cd libs/async-cassandra
+          python -m build
+
+      - name: Check package
+        run: |
+          cd libs/async-cassandra
+          twine check dist/*
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-package-distributions
+          path: libs/async-cassandra/dist/
+          retention-days: 7
+
   publish-testpypi:
     name: Publish to TestPyPI
-    needs: full-ci
+    needs: [full-ci, build-package]
     runs-on: ubuntu-latest
     # Only publish for proper pre-release versions (PEP 440)
     if: contains(github.ref_name, 'rc') || contains(github.ref_name, 'a') || contains(github.ref_name, 'b')
@@ -264,11 +300,11 @@ jobs:
 
   publish-pypi:
     name: Publish to PyPI
-    needs: full-ci
+    needs: [full-ci, build-package]
     runs-on: ubuntu-latest
     # Only publish stable versions (no pre-release suffix)
     # Match only versions like v0.0.1, v1.2.3, etc (no suffix)
-    if: "!contains(github.ref_name, '-')"
+    if: "!contains(github.ref_name, 'rc') && !contains(github.ref_name, 'a') && !contains(github.ref_name, 'b') && !contains(github.ref_name, 'dev')"
 
     permissions:
       id-token: write  # Required for trusted publishing

README.md

@@ -30,6 +30,8 @@ This is a monorepo containing two related Python packages:
 - [📋 Requirements](#-requirements)
   - [🔌 CQL Protocol Version Requirement](#-cql-protocol-version-requirement)
 - [🔧 Installation](#-installation)
+  - [async-cassandra (Main Library)](#async-cassandra-main-library)
+  - [async-cassandra-bulk (Coming Soon)](#async-cassandra-bulk-coming-soon)
 - [📚 Quick Start](#-quick-start)
 - [🤝 Contributing](#-contributing)
 - [📞 Support](#-support)
@@ -38,7 +40,7 @@ This is a monorepo containing two related Python packages:
   - [Advanced Topics](#advanced-topics)
   - [Examples](#examples)
 - [🎯 Running the Examples](#-running-the-examples)
-  - [Available Examples](#available-examples)
+  - [Running Examples](#running-examples)
   - [Running with External Cassandra](#running-with-external-cassandra)
   - [Example Descriptions](#example-descriptions)
 - [⚡ Performance](#-performance)

libs/async-cassandra/pyproject.toml

@@ -196,5 +196,5 @@ ignore_missing_imports = true
 # - 0.1.0rc7 (from tag async-cassandra-v0.1.0rc7)
 # - 0.1.0.dev1+g1234567 (from commits after tag)
 root = "../.."
-tag_regex = "^async-cassandra-v(?P<version>.+)$"
+tag_regex = "^(async-cassandra-)?v(?P<version>.+)$"
 fallback_version = "0.1.0.dev0"