1. migrate from poetry to uv

2. migrate from black+flake8 to ruff
3. drop support for Python3.8

Author: waketzheng

.github/workflows/ci.yml

@@ -26,22 +26,16 @@ jobs:
       TEST_MSSQL_PASS: Abcd12345678
     strategy:
       matrix:
-        python-version: [ "3.8", "3.9", "3.10" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
     steps:
-      - uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install and configure Poetry
-        run: |
-          pip install -U pip poetry
-          poetry config virtualenvs.create false
+      - uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          activate-environment: true
       - name: Install requirements
         run: make deps
       - name: Install ODBC driver
@@ -53,7 +47,7 @@ jobs:
       - name: Run ci
         run: make ci
       - name: Upload Coverage
-        run: coveralls --service=github
+        run: uvx coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_FLAG_NAME: ${{ matrix.python-version }}

.github/workflows/pypi.yml

@@ -7,18 +7,15 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.x'
-      - name: Install and configure Poetry
-        run: |
-          pip install -U pip poetry
-          poetry config virtualenvs.create false
+      - uses: astral-sh/setup-uv@v7
       - name: Build dists
         run: make build
       - name: Pypi Publish
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

Makefile

@@ -3,43 +3,51 @@ py_warn = PYTHONDEVMODE=1
 pytest_opts = -n auto --cov=asyncodbc --tb=native -q
 
 up:
-	@poetry update
+	@uv lock --upgrade
 
 deps:
-	@poetry install
-
-check: deps build
-ifneq ($(shell which black),)
-	black --check $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
-endif
-	pflake8 $(checkfiles)
-	#mypy $(checkfiles)
-	#pylint -d C,W,R $(checkfiles)
-	#bandit -r $(checkfiles)
+	@uv sync --inexact --all-extras --all-groups $(options)
+
+_style:
+	@ruff format $(checkfiles)
+	@ruff check --fix $(checkfiles)
+style: deps _style
+
+_codeqc:
+	# mypy $(checkfiles)
+	bandit -c pyproject.toml -r $(checkfiles)
 	twine check dist/*
+codeqc: build _codeqc
+
+_check: _build
+	@ruff format --check $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
+	@ruff check $(checkfiles)
+	$(MAKE) _codeqc
+check: deps _check
 
+_lint: _build _style _codeqc
+lint: deps _lint
 
-test_mssql: deps
+test: deps test_mssql
+
+test_mssql:
 	$(py_warn) TEST_DSN="DRIVER=ODBC Driver 18 for SQL Server;SERVER=127.0.0.1,1433;UID=sa;PWD=$(TEST_MSSQL_PASS);TrustServerCertificate=YES;MARS_Connection=YES" pytest $(pytest_opts)
 
 _testall: test_mssql
 
 testall: deps _testall
 	coverage report
 
-ci: check testall
+ci: check _testall
 
 docs: deps
 	rm -fR ./build
 	sphinx-build -M html docs build
 
-style: deps
-	isort -src $(checkfiles)
-	black $(checkfiles)
-
-build: deps
+_build:
 	rm -fR dist/
-	poetry build
+	uv build
+build: deps _build
 
 publish: deps build
 	twine upload dist/*

asyncodbc/connection.py

@@ -21,7 +21,7 @@ def connect(
     executor=None,
     echo=False,
     after_created=None,
-    **kwargs
+    **kwargs,
 ):
     """Accepts an ODBC connection string and returns a new Connection object.
 
@@ -53,7 +53,7 @@ def connect(
             executor=executor,
             echo=echo,
             after_created=after_created,
-            **kwargs
+            **kwargs,
         )
     )
 
@@ -67,7 +67,7 @@ async def _connect(
     executor=None,
     echo=False,
     after_created=None,
-    **kwargs
+    **kwargs,
 ):
     conn = Connection(
         dsn=dsn,
@@ -77,7 +77,7 @@ async def _connect(
         echo=echo,
         executor=executor,
         after_created=after_created,
-        **kwargs
+        **kwargs,
     )
     await conn._connect()
     return conn
@@ -101,7 +101,7 @@ def __init__(
         executor=None,
         echo=False,
         after_created=None,
-        **kwargs
+        **kwargs,
     ):
         self._executor = executor
         self._loop = asyncio.get_event_loop()
@@ -133,7 +133,7 @@ async def _connect(self):
             autocommit=self._autocommit,
             ansi=self._ansi,
             timeout=self._timeout,
-            **self._kwargs
+            **self._kwargs,
         )
         self._conn = await f
         self._connected = True

asyncodbc/cursor.py

@@ -269,9 +269,7 @@ def rowVerColumns(self, table, catalog=None, schema=None, nullable=True):  # nop
     def primaryKeys(self, table, catalog=None, schema=None):  # nopep8
         """Creates a result set of column names that make up the primary key
         for a table by executing the SQLPrimaryKeys function."""
-        fut = self._run_operation(
-            self._impl.primaryKeys, table, catalog=catalog, schema=schema
-        )
+        fut = self._run_operation(self._impl.primaryKeys, table, catalog=catalog, schema=schema)
         return fut
 
     def foreignKeys(self, *a, **kw):  # nopep8

asyncodbc/pool.py

@@ -1,6 +1,5 @@
 import asyncio
 import collections
-from typing import Deque, Set
 
 from .connection import Connection, connect
 from .utils import _PoolAcquireContextManager, _PoolContextManager
@@ -11,19 +10,13 @@
 def create_pool(minsize=1, maxsize=10, echo=False, pool_recycle=-1, **kwargs):
     return _PoolContextManager(
         _create_pool(
-            minsize=minsize,
-            maxsize=maxsize,
-            echo=echo,
-            pool_recycle=pool_recycle,
-            **kwargs
+            minsize=minsize, maxsize=maxsize, echo=echo, pool_recycle=pool_recycle, **kwargs
         )
     )
 
 
 async def _create_pool(minsize=1, maxsize=10, echo=False, pool_recycle=-1, **kwargs):
-    pool = Pool(
-        minsize=minsize, maxsize=maxsize, echo=echo, pool_recycle=pool_recycle, **kwargs
-    )
+    pool = Pool(minsize=minsize, maxsize=maxsize, echo=echo, pool_recycle=pool_recycle, **kwargs)
     if minsize > 0:
         async with pool.cond:
             await pool.fill_free_pool(False)
@@ -34,13 +27,8 @@ class Pool(asyncio.AbstractServer):
     """Connection pool, just from aiomysql"""
 
     def __init__(
-        self,
-        minsize: int,
-        maxsize: int,
-        pool_recycle: int,
-        echo: bool = False,
-        **kwargs
-    ):
+        self, minsize: int, maxsize: int, pool_recycle: int, echo: bool = False, **kwargs
+    ) -> None:
         if minsize < 0:
             raise ValueError("minsize should be zero or greater")
         if maxsize < minsize:
@@ -49,10 +37,10 @@ def __init__(
         self._loop = asyncio.get_event_loop()
         self._conn_kwargs = kwargs
         self._acquiring = 0
-        self._free: Deque[Connection] = collections.deque(maxlen=maxsize)
+        self._free: collections.deque[Connection] = collections.deque(maxlen=maxsize)
         self._cond = asyncio.Condition()
-        self._used: Set[Connection] = set()
-        self._terminated: Set[Connection] = set()
+        self._used: set[Connection] = set()
+        self._terminated: set[Connection] = set()
         self._closing = False
         self._closed = False
         self._echo = echo
@@ -128,7 +116,7 @@ async def wait_closed(self):
         if self._closed:
             return
         if not self._closing:
-            raise RuntimeError(".wait_closed() should be called " "after .close()")
+            raise RuntimeError(".wait_closed() should be called after .close()")
 
         while self._free:
             conn = self._free.popleft()
@@ -165,8 +153,7 @@ async def fill_free_pool(self, override_min: bool = False):
         while n < free_size:
             conn = self._free[-1]
             if conn.expired or (
-                self._recycle > -1
-                and self._loop.time() - conn.last_usage > self._recycle
+                self._recycle > -1 and self._loop.time() - conn.last_usage > self._recycle
             ):
                 self._free.pop()
                 await conn.close()