Merge branch 'main' into feat/custom-types

Author: edgarrmondragon

.github/workflows/release.yaml

@@ -12,10 +12,10 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
-            -   uses: actions/setup-python@v4
+            -   uses: actions/checkout@v4
+            -   uses: actions/setup-python@v5
                 with:
-                    python-version: 3.8
+                    python-version: 3.12
             -   name: Install dependencies
                 env:
                     PIP_CONSTRAINT: .github/workflows/constraints.txt
@@ -34,7 +34,7 @@ jobs:
         needs: build
         environment: publish
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
             -   uses: actions/download-artifact@v3
                 with:
                     name: dist
@@ -48,4 +48,4 @@ jobs:
                     file_glob: true
 
             -   name: Publish
-                uses: pypa/[email protected].10
+                uses: pypa/[email protected].11

.github/workflows/test.yaml

@@ -7,15 +7,15 @@ on:
             - src/**
             - tests/**
             - pyproject.toml
-            - .github/workflows/test.yml
+            - .github/workflows/test.yaml
             - .github/workflows/constraints.txt
     pull_request:
         branches: [ main ]
         paths:
             - src/**
             - tests/**
             - pyproject.toml
-            - .github/workflows/test.yml
+            - .github/workflows/test.yaml
             - .github/workflows/constraints.txt
     workflow_dispatch: {}
     schedule:
@@ -31,11 +31,11 @@ jobs:
         name: Lint
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-python@v4
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v5
               with:
                   cache: pip
-                  python-version: "3.11"
+                  python-version: "3.12"
             - name: Install dependencies
               env:
                 PIP_CONSTRAINT: .github/workflows/constraints.txt
@@ -51,11 +51,11 @@ jobs:
       name: Typing
       runs-on: ubuntu-latest
       steps:
-          - uses: actions/checkout@v3
-          - uses: actions/setup-python@v4
+          - uses: actions/checkout@v4
+          - uses: actions/setup-python@v5
             with:
                 cache: pip
-                python-version: "3.11"
+                python-version: "3.12"
           - name: Install dependencies
             env:
               PIP_CONSTRAINT: .github/workflows/constraints.txt
@@ -68,30 +68,44 @@ jobs:
               hatch run check
 
     test:
-        name: Pytest (Python ${{ matrix.python-version }}, ${{ matrix.os }}, SQLAlchemy ${{ matrix.sqlalchemy-version }})
+        name: Pytest (Python ${{ matrix.python-version }}, ${{ matrix.os }}, SQLAlchemy ${{ matrix.sqlalchemy-version }})${{ matrix.nightly && ' (nightly)' || '' }}
         runs-on: ${{ matrix.os }}
-        continue-on-error: ${{ matrix.python-version == '3.12' }}
+        continue-on-error: ${{ matrix.python-version == '3.13' }}
         strategy:
             fail-fast: false
             matrix:
                 os: ["ubuntu-latest"]
-                python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+                python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
                 sqlalchemy-version: ["1", "2"]
                 include:
-                    - python-version: "3.11"
+                    - python-version: "3.12"
                       sqlalchemy-version: "2"
                       os: "windows-latest"
 
-                    - python-version: "3.11"
+                    - python-version: "3.12"
                       sqlalchemy-version: "2"
                       os: "macos-latest"
+
+                    - python-version: "3.13"
+                      sqlalchemy-version: "2"
+                      os: "ubuntu-latest"
+                      nightly: true
+
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-python@v4
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v5
+              if: "${{ !matrix.nightly }}"
               with:
                   cache: pip
                   python-version: ${{ matrix.python-version }}
                   allow-prereleases: true
+                  architecture: x64
+            - name: Setup Python ${{ matrix.python-version }} (nightly)
+              if: "${{ matrix.nightly }}"
+              uses: deadsnakes/[email protected]
+              with:
+                python-version: "${{ matrix.python-version }}-dev"
+
             - name: Install dependencies
               env:
                 PIP_CONSTRAINT: .github/workflows/constraints.txt
@@ -114,8 +128,8 @@ jobs:
         env:
           HATCH_ENV: coverage
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-python@v4
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v5
               with:
                   python-version: "3.11"
             - name: Install dependencies

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml
@@ -18,12 +18,16 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.291
+    rev: v0.1.7
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix, --show-fixes]
+        name: Ruff lint
+        args: [--fix, --preview, --exit-non-zero-on-fix, --show-fixes]
+      - id: ruff
+        name: Ruff format
+        entry: ruff format
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "1.1.0"
+    rev: "1.5.3"
     hooks:
       - id: pyproject-fmt

CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [git-cliff](https://github.com/orhun/git-cliff).
 
+## [0.1.1] - 2023-10-6
+
+### Added
+
+- Official support for Python 3.12 ([#39](https://github.com/edgarrmondragon/sqlean-driver/issues/39))
+
+### Testing
+
+- Report version `sqlean.py` in pytest output ([#25](https://github.com/edgarrmondragon/sqlean-driver/issues/25))
+- Catch warnings ([#28](https://github.com/edgarrmondragon/sqlean-driver/issues/28))
+
 ## [0.1.0] - 2023-08-14
 
 ### Added

pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: SQL",
   "Topic :: Database",
@@ -41,13 +42,18 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "greenlet>=3.0.0a1",
   "sqlalchemy>=1.4",
   "sqlean-py>=0.21.5.1",
 ]
 [project.optional-dependencies]
-dev = [
+coverage = [
+  "coverage[toml]>=6.5",
+]
+testing = [
   "pytest",
+]
+typing = [
+  "mypy>=1",
   'typing-extensions; python_version < "3.10"',
 ]
 [project.urls]
@@ -67,53 +73,54 @@ dependencies = [
   "pytest-github-actions-annotate-failures",
   "sqlalchemy=={matrix:sqlalchemy:2}.*",
 ]
-features = ["dev"]
+features = ["testing"]
 matrix-name-format = "{variable}_{value}"
 [tool.hatch.envs.test.env-vars]
 SQLALCHEMY_WARN_20 = "1"
+[tool.hatch.envs.test.overrides]
+env.GITHUB_ACTIONS.dev-mode = { value = false, if = ["true"] }
+
 [tool.hatch.envs.test.scripts]
 run = "pytest {args:tests}"
 cov = "coverage run -m pytest {args:tests}"
 
 [[tool.hatch.envs.test.matrix]]
 sqlalchemy = ["1", "2"]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
+python = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
 [tool.hatch.envs.coverage]
-dependencies = [
-  "coverage[toml]>=6.5",
-]
+features = ["coverage"]
 [tool.hatch.envs.coverage.scripts]
 json = "coverage json"
 xml = "coverage xml"
-report = ["coverage combine", "coverage report --show-missing"]
+report = ["coverage combine --debug=pathmap", "coverage report --show-missing"]
 
 [tool.hatch.envs.typing]
-dependencies = ["mypy>=1.0.0"]
-features = ["dev"]
+features = ["testing", "typing"]
 [tool.hatch.envs.typing.scripts]
 check = "mypy --strict --install-types --non-interactive {args:src/sqlean_driver tests}"
 
 [tool.hatch.envs.lint]
+dependencies = ["ruff>=0.1"]
 detached = true
-dependencies = ["black>=23.1.0", "mypy>=1.0.0", "ruff>=0.0.243"]
 [tool.hatch.envs.lint.scripts]
-style = ["ruff check {args:.}", "black --check --diff {args:.}"]
-style-gh = ["ruff check {args:.} --format github", "black --check --diff {args:.}"]
-fmt = ["black {args:.}", "ruff check --fix {args:.}", "style"]
+style = ["ruff check {args:.}", "ruff format --check --diff {args:.}"]
+style-gh = ["ruff check {args:.} --output-format github", "ruff format --check --diff {args:.}"]
+fmt = ["ruff --fix {args:.}", "ruff format {args:.}"]
 
-[tool.black]
-target-version = ["py38"]
+[tool.ruff]
 line-length = 100
-skip-string-normalization = true
+target-version = "py38"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = [
   "ANN101",  # missing-type-self
   "ANN102",  # missing-type-cls
   "FIX002",  # line-contains-todo
+  "COM812",  # missing-trailing-comma
+  "ISC001",  # single-line-implicit-string-concatenation
 ]
-line-length = 100
+preview = true
 select = [
   "F",       # Pyflakes
   "E",       # pycodestyle (error)
@@ -207,49 +214,51 @@ select = [
   "FURB132", # check-and-remove-from-set
   "RUF",     # Ruff-specific rules
 ]
-target-version = "py38"
 unfixable = [
   "ERA",
   "F401",
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["sqlean_driver"]
 required-imports = ["from __future__ import annotations"]
 
-[tool.ruff.flake8-annotations]
+[tool.ruff.lint.flake8-annotations]
 allow-star-arg-any = true
 
-[tool.ruff.flake8-import-conventions]
+[tool.ruff.lint.flake8-import-conventions]
 banned-from = ["typing"]
 
-[tool.ruff.flake8-import-conventions.extend-aliases]
+[tool.ruff.lint.flake8-import-conventions.extend-aliases]
 typing = "t"
 
-[tool.ruff.flake8-tidy-imports]
+[tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 
-[tool.ruff.pep8-naming]
+[tool.ruff.lint.pep8-naming]
 ignore-names = ["visit_*"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 # Tests can use magic values, assertions, and relative imports
 "tests/**/*" = ["PLR2004", "S101", "TID252", "ANN201"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "google"
 
 [tool.pytest.ini_options]
 addopts = ["-vv", "-W error"]
 
+[tool.coverage.paths]
+package = [
+  "src/sqlean_driver/",
+  "*/site-packages/sqlean_driver/",
+]
+
 [tool.coverage.run]
-source_pkgs = ["sqlean_driver", "tests"]
 branch = true
+source = ["sqlean_driver", "tests"]
 parallel = true
-
-[tool.coverage.paths]
-sqlean_driver = ["src/sqlean_driver", "*/sqlean-driver/src/sqlean_driver"]
-tests = ["tests", "*/sqlean-driver/tests"]
+relative_files = true
 
 [tool.coverage.report]
 exclude_lines = [

src/sqlean_driver/__init__.py

@@ -27,8 +27,8 @@
 class SQLeanTypeCompiler(SQLiteTypeCompiler):
     """A type compiler for SQLite that uses sqlean.py as the DBAPI."""
 
-    def visit_INET(
-        self,  # noqa: PLR6301
+    def visit_INET(  # noqa: PLR6301
+        self,
         type_: TypeEngine[IPAddress],  # noqa: ARG002
         **kw: t.Any,  # noqa: ARG002
     ) -> str:
@@ -101,7 +101,7 @@ def dbapi(cls) -> ModuleType:  # type: ignore[override]
     @classmethod
     def import_dbapi(cls) -> ModuleType:
         """Return the DBAPI module."""
-        import sqlean
+        import sqlean  # noqa: PLC0415
 
         return sqlean  # type: ignore[no-any-return]