use connection instead of service/cursor (#41)

* use connection instead of service/cursor

* fix tests

* more fixes

* drop psycopg2 support

* fix workflow

* named args

* more

* fix

* more fixes

* improve readability

* fix arg name

* fix

* update test+

* fix test

Author: 3nids

.github/workflows/deploy-to-pypi.yml

@@ -0,0 +1,41 @@
+name: 🚀 Deploying to pypi
+
+on:
+  push:
+    tags:
+      - "*"
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  build-python-wheel:
+    name: "🐍 Python Wheel"
+    uses: ./.github/workflows/wheel.yml
+    secrets: inherit
+
+  release-pypi:
+    name: "🐍 Release on PyPI"
+    runs-on: ubuntu-latest
+    needs: [build-python-wheel]
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    environment:
+      name: pypi
+      url: https://pypi.org/p/${{ github.event.repository.name }}
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+      - name: Retrieve artifact from Python build
+        uses: actions/download-artifact@v4
+        with:
+          name: python_wheel
+          path: dist/
+
+      - name: upload release asset
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release upload --repo ${{ github.repository_owner }}/${{ github.event.repository.name }} ${{ github.ref_name }} "dist/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz"
+
+      - name: Deploy to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/release.yml

@@ -17,7 +17,6 @@ jobs:
 
     strategy:
       matrix:
-        psycopg-version: [2, 3]
         pg-version: [12, 13, 14, 15, 16]
       fail-fast: true
 
@@ -60,10 +59,9 @@ jobs:
         run: |
           pip install -r requirements.txt
           pip install -r requirements-test.txt
-          pip install -r requirements-psycopg${{ matrix.psycopg-version }}.txt
 
       - name: Install pirogue
-        run: python -m pip install -e .[psycopg${{ matrix.psycopg-version }}]
+        run: python -m pip install -e .
 
       - name: Setup tests
         run: |

.github/workflows/test.yml

@@ -34,8 +34,7 @@ jobs:
         run: python -m pip install -e .
 
       - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m build --sdist --wheel --outdir dist/ .
+        run: python -m  build .
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/wheel.yml

@@ -39,7 +39,7 @@ repos:
 
   # tool to automatically upgrade syntax for newer versions of the language
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

.pre-commit-config.yaml

@@ -3,6 +3,7 @@
 import argparse
 import os
 
+import psycopg
 import yaml
 
 from pirogue.multiple_inheritance import MultipleInheritance
@@ -97,11 +98,13 @@ def main():
     else:
         pg_service = os.getenv("PGSERVICE")
 
+    conn = psycopg.connect(f"service={pg_service}")
+
     if args.command == "single_inheritance":
         success = SingleInheritance(
             parent_table=args.parent_table,
             child_table=args.child_table,
-            pg_service=pg_service,
+            connection=conn,
             view_schema=args.view_schema,
             view_name=args.view_name,
             pkey_default_value=args.pkey_default_value,
@@ -123,12 +126,12 @@ def main():
             yaml_definition,
             variables=variables,
             create_joins=args.create_joins,
-            pg_service=pg_service,
+            connection=conn,
         ).create()
 
     elif args.command == "simple_joins":
         yaml_definition = yaml.safe_load(args.definition_file)
-        SimpleJoins(yaml_definition, pg_service=pg_service).create()
+        SimpleJoins(yaml_definition, connection=conn).create()
 
     exit(exit_val)