execsql2 2.17.0__tar.gz → 2.17.2__tar.gz

{execsql2-2.17.0 → execsql2-2.17.2}/.github/workflows/ci-cd.yml

@@ -69,9 +69,19 @@ jobs:
             - name: Install tkinter (Ubuntu)
               if: runner.os == 'Linux'
               run: sudo apt-get install -y python3-tk
+            - name: Install unixodbc (macOS)
+              # tox installs the [all] extra which pulls in pyodbc; pyodbc's
+              # native .so depends on libodbc.2.dylib from the unixodbc
+              # package, otherwise importing it fails and any DSN test bails.
+              if: runner.os == 'macOS'
+              run: brew install unixodbc
             - name: Test with tox
               env:
                   DISPLAY: ""
+              # Ubuntu finishes in ~9 min and Windows in ~16 min; 30 leaves
+              # ample headroom. Step-level timeout fails the step (not the
+              # job), so continue-on-error can mask it on macOS.
+              timeout-minutes: 30
               run: |
                   tox -e py
             - name: Upload coverage to Codecov
@@ -115,6 +125,18 @@ jobs:
                 options: >-
                     --health-cmd "mysqladmin ping" --health-interval 10s
                     --health-timeout 5s --health-retries 5
+            sqlserver:
+                image: mcr.microsoft.com/mssql/server:2022-latest
+                env:
+                    ACCEPT_EULA: "Y"
+                    MSSQL_SA_PASSWORD: "ExecSql_Test123!"
+                    MSSQL_PID: "Developer"
+                ports:
+                    - 1433:1433
+                options: >-
+                    --health-cmd "/opt/mssql-tools18/bin/sqlcmd
+                    -S localhost -U sa -P 'ExecSql_Test123!' -Q 'SELECT 1' -No || exit 1"
+                    --health-interval 10s --health-timeout 5s --health-retries 20
         steps:
             - name: Check out repository code
               uses: actions/checkout@v6
@@ -122,13 +144,79 @@ jobs:
               uses: actions/setup-python@v6
               with:
                   python-version: ${{ matrix.python-version }}
+            - name: Install tkinter (Ubuntu)
+              run: sudo apt-get update && sudo apt-get install -y python3-tk
+            - name: Install Microsoft ODBC Driver 18 for SQL Server
+              run: |
+                  curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc > /dev/null
+                  curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+                  sudo apt-get update
+                  sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev
+                  odbcinst -j
+                  odbcinst -q -d
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
-                  python -m pip install ".[dev,postgres,mysql]"
-            - name: Run integration tests
+                  python -m pip install ".[dev,postgres,mysql,mssql]"
+            - name: Run subprocess integration tests
               run: |
                   python -m pytest tests/integration/test_postgres.py tests/integration/test_mysql.py -v --override-ini="addopts="
+            - name: Run in-process DB adapter tests with 86% coverage floor
+              env:
+                  DISPLAY: ""
+              run: |
+                  python -m pytest --cov=execsql --cov-branch --cov-report=xml --cov-fail-under=86
+            - name: Upload coverage to Codecov
+              uses: codecov/codecov-action@v6
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}
+                  files: coverage.xml
+
+    access-tests-windows:
+        name: access-tests-windows
+        runs-on: windows-latest
+        # Best-effort: Access Database Engine install can be flaky on hosted
+        # runners.  Failures don't gate the rest of the pipeline.
+        continue-on-error: true
+        strategy:
+            fail-fast: false
+            matrix:
+                python-version:
+                    - "3.13"
+        permissions:
+            contents: read
+        steps:
+            - uses: actions/checkout@v6
+            - uses: actions/setup-python@v6
+              with:
+                  python-version: ${{ matrix.python-version }}
+            - name: Install Microsoft Access Database Engine 2016 (x64)
+              # The chocolatey `accessdatabaseengine-x64` package was removed
+              # from the community feed; download the redistributable directly
+              # from Microsoft and run it silently instead.
+              run: |
+                  $ErrorActionPreference = 'Stop'
+                  $url = 'https://download.microsoft.com/download/3/5/C/35C84C36-661A-44E6-9324-8786B8DBE231/AccessDatabaseEngine_X64.exe'
+                  $dst = Join-Path $env:RUNNER_TEMP 'AccessDatabaseEngine_X64.exe'
+                  Write-Host "Downloading $url"
+                  Invoke-WebRequest -Uri $url -OutFile $dst -UseBasicParsing
+                  Write-Host "Installing $dst"
+                  $proc = Start-Process -FilePath $dst -ArgumentList '/quiet','/norestart' -Wait -PassThru
+                  Write-Host "Installer exit code: $($proc.ExitCode)"
+                  # 0 = success, 3010 = success but reboot pending. Anything else is a failure.
+                  if ($proc.ExitCode -ne 0 -and $proc.ExitCode -ne 3010) { exit $proc.ExitCode }
+              shell: pwsh
+            - name: Install Python dependencies
+              run: |
+                  python -m pip install --upgrade pip
+                  python -m pip install ".[dev,odbc]" pywin32
+              shell: pwsh
+            - name: Run Access real-driver tests
+              env:
+                  DISPLAY: ""
+              run: |
+                  python -m pytest tests/db/test_access_windows.py -v --override-ini="addopts="
+              shell: pwsh
 
     build:
         name: Build distribution 📦