More adjustments for v2.0

- More tests
- Type hints adjustments
- More shields

Author: pcisar

CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0] - Unreleased
+
+### Fixed
+
+- #22: Allow use of Firebird embedded engine for tests
+- #41: Some `firebird.conf` parameters are missing in `fbapi.config_items`
+- Fix: Added validation-related info codes that were ommited in `DatabaseInfoProvider3`.
+- Fix: Properly handle situation when parameter `database` for `connect` and `create_database` is
+  a DSN.
+- Fix: `TPB.parse_buffer` handling of new READ COMMITTED READ CONSISTENCY.
+- Fix: `DPB.parse_buffer` and `SPB_ATTACH.parse_buffer`.
+- Fix: Introduce `StatementInfoProvider4` for proper handling of FB v5 additions.
+- Fix: `ServerInfoProvider` handling of `SrvInfoCode.LIMBO_TRANS` info code.
+
+### Changed
+
+- Minimal Python version raised to 3.11
+- Test changed from `unittest` to `pytest`
+- Parameter `database` for `connect` and `create_database` now accepts `pathlib.Path` objects.
+- Removed all usage of `LoggingIdMixin` as it's no longer available in `firebird-base` v2.0.
+- Typy hints adjusted to Python 3.11 standards
+
+### Added
+
+- More tests for greater coverage
+
 ## [1.10.11] - 2025-04-22
 
 ### Changed

README.md

@@ -5,6 +5,8 @@
 [![PyPI - Version](https://img.shields.io/pypi/v/firebird-driver.svg)](https://pypi.org/project/firebird-driver)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/firebird-driver.svg)](https://pypi.org/project/firebird-driver)
 [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/firebird-driver)](https://pypi.org/project/firebird-driver)
+[![Libraries.io SourceRank](https://img.shields.io/librariesio/sourcerank/pypi/firebird-driver)](https://libraries.io/pypi/firebird-driver)
 
 This package provides official Python Database API 2.0-compliant driver for the open
 source relational database Firebird®. In addition to the minimal feature set of
@@ -38,3 +40,25 @@ to this driver.
 
 The documentation for this package is available at [https://firebird-driver.readthedocs.io](https://firebird-driver.readthedocs.io)
 
+## Running tests
+
+This project uses [hatch](https://hatch.pypa.io/latest/) , so you can use:
+```console
+hatch test
+```
+to run all tests for default Python version (3.11). To run tests for all Python versions
+defined in matrix, use `-a` switch.
+
+This project is using [pytest](https://docs.pytest.org/en/stable/) for testing, and our
+tests add several options via `tests/conftest.py`.
+
+By default, tests are configured to use local Firebird installation via network access.
+To use local instllation in `mebedded` mode, comment out the section:
+```
+[tool.hatch.envs.hatch-test]
+extra-args = ["--host=localhost"]
+```
+in `pyproject.toml`.
+
+You can also use firebird driver configuration file to specify server(s) that should be
+used for testing, and then pass `--driver-config` and `--server` options to `pytest`.

docs/changelog.txt

@@ -5,13 +5,20 @@ Changelog
 Version 2.0.0
 =============
 
-- Test changed from `unittest` to `pytest`.
+- Test changed from `unittest` to `pytest`, more tests for greater coverage.
+- #22: Allow use of Firebird embedded engine for tests
 - Minimal Python version raised to 3.11
 - Parameter `database` for `connect` and `create_database` now accepts `~pathlib.Path` objects.
 - Fix: Properly handle situation when parameter `database` for `connect` and `create_database` is
   a DSN.
 - Removed all usage of `LoggingIdMixin` as it's no longer available in `firebird-base` v2.0.
-- Added missing entries in `fbapi.config_items`.
+- #41: Some `firebird.conf` parameters are missing in `fbapi.config_items`
+- Fix: Added validation-related info codes that were ommited in `.DatabaseInfoProvider3`.
+- Typy hints adjusted to Python 3.11 standards
+- Fix: `.TPB.parse_buffer` handling of new READ COMMITTED READ CONSISTENCY.
+- Fix: `.DPB.parse_buffer` and `.SPB_ATTACH.parse_buffer`.
+- Fix: Introduce `.StatementInfoProvider4` for proper handling of FB v5 additions.
+- Fix: `ServerInfoProvider` handling of `SrvInfoCode.LIMBO_TRANS` info code.
 
 Version 1.10.11
 ===============

pyproject.toml

@@ -1,13 +1,13 @@
 [build-system]
-requires = ["hatchling>=1.27.0"]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
 name = "firebird-driver"
 description = "Firebird driver for Python"
 dynamic = ["version"]
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 license = { file = "LICENSE" }
 authors = [
   { name = "Pavel Cisar", email = "pcisar@users.sourceforge.net"},
@@ -18,20 +18,18 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: POSIX :: Linux",
   "Operating System :: Microsoft :: Windows",
   "Operating System :: MacOS",
   "Topic :: Software Development",
   "Topic :: Database",
 ]
 dependencies = [
-  "firebird-base~=1.8",
-  "python-dateutil>=2.8",
+  #"firebird-base @file:////home/job/python/projects/firebird-base",
+  "firebird-base~=2.0",
 ]
 
 [project.urls]
@@ -50,18 +48,25 @@ include = ["src"]
 [tool.hatch.build.targets.wheel]
 packages = ["src/firebird"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.hatch.envs.default]
 dependencies = [
 ]
 
+[tool.hatch.envs.hatch-test]
+extra-args = ["--host=localhost"]
+
 [tool.hatch.envs.test]
 dependencies = [
   "coverage[toml]>=6.5",
   "pytest",
 ]
+
 [tool.hatch.envs.test.scripts]
-test = "pytest {args:tests}"
-test-cov = "coverage run -m pytest {args:tests}"
+test = "pytest --host=localhost {args:tests}"
+test-cov = "coverage run -m pytest --host=localhost {args:tests}"
 cov-report = [
   "- coverage combine",
   "coverage report",
@@ -76,8 +81,8 @@ cov = [
 ]
 version = "python --version"
 
-[[tool.hatch.envs.test.matrix]]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.11", "3.12", "3.13"]
 
 [tool.hatch.envs.doc]
 detached = false
@@ -95,63 +100,13 @@ docset = [
   "cd docs; VERSION=`hatch version` ; tar --exclude='.DS_Store' -cvzf ../dist/firebird-driver-$VERSION-docset.tgz firebird-driver.docset",
 ]
 
-[tool.hatch.envs.lint]
-detached = true
-dependencies = [
-  "black>=23.1.0",
-  "mypy>=1.0.0",
-  "ruff>=0.0.243",
-]
-[tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive {args:src/firebird/driver tests}"
-style = [
-  "ruff {args:.}",
-  "black --check --diff {args:.}",
-]
-fmt = [
-  "black {args:.}",
-  "ruff --fix {args:.}",
-  "style",
-]
-all = [
-  "style",
-  "typing",
-]
-
-[tool.black]
-target-version = ["py38"]
-line-length = 120
-skip-string-normalization = true
-
 [tool.ruff]
-target-version = "py38"
+target-version = "py311"
 line-length = 120
-select = [
-  "A",
-  "ARG",
-  "B",
-  "C",
-  "DTZ",
-  "E",
-  "EM",
-  "F",
-  "FBT",
-  "I",
-  "ICN",
-  "ISC",
-  "N",
-  "PLC",
-  "PLE",
-  "PLR",
-  "PLW",
-  "Q",
-  "RUF",
-  "S",
-  "T",
-  "TID",
-  "UP",
-  "W",
-  "YTT",
+
+[tool.ruff.lint]
+select = ["A", "ARG", "B", "C", "DTZ", "E", "EM", "F", "FBT", "I", "ICN", "ISC", "N",
+  "PLC", "PLE", "PLR", "PLW", "Q", "RUF", "S", "T", "TID", "UP", "W", "YTT",
 ]
 ignore = [
   # Allow non-abstract empty methods in abstract base classes
@@ -162,19 +117,29 @@ ignore = [
   "S105", "S106", "S107",
   # Ignore complexity
   "C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
+  #
+  "E741",
+  # Allow relative imports
+  "TID252",
+  # Allow literals in exceptions
+  "EM101", "EM102",
+  # Single quotes instead double
+  "Q000"
 ]
 unfixable = [
   # Don't touch unused imports
   "F401",
+  # Don't change single quotes to double
+  "Q000"
 ]
 
-[tool.ruff.isort]
-known-first-party = ["firebird.driver"]
+[tool.ruff.lint.isort]
+known-first-party = ["firebird.base"]
 
-[tool.ruff.flake8-tidy-imports]
+[tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 # Tests can use magic values, assertions, and relative imports
 "tests/**/*" = ["PLR2004", "S101", "TID252"]
 
@@ -187,8 +152,8 @@ omit = [
 ]
 
 [tool.coverage.paths]
-firebird_driver = ["src/python", "*/python/src/firebird/driver"]
-tests = ["tests", "*/python/tests"]
+firebird_base = ["src/firebird/driver"]
+tests = ["tests"]
 
 [tool.coverage.report]
 exclude_lines = [

src/firebird/driver/__init__.py

@@ -58,7 +58,7 @@
      get_timezone)
 from .core import (connect, create_database, connect_server, transaction, temp_database,
      tpb, TPB, CHARSET_MAP, TIMEOUT, DistributedTransactionManager, Connection, Cursor,
-     Server, Statement)
+     Server, Statement, TransactionManager)
 
 #: Current driver version, SEMVER string.
 __VERSION__ = '2.0.0'

src/firebird/driver/config.py

@@ -39,7 +39,7 @@
 """
 
 from __future__ import annotations
-from typing import Dict, Union, Iterable
+from typing import Iterable
 import os
 from firebird.base.config import Config, StrOption, IntOption, BoolOption, EnumOption, \
      ConfigListOption, ListOption, ConfigParser, EnvExtendedInterpolation
@@ -205,7 +205,7 @@ def __init__(self, name: str):
         #: Registered databases
         self.databases: ConfigListOption = \
             ConfigListOption('databases', DatabaseConfig, "Registered databases")
-    def read(self, filenames: Union[str, Iterable], encoding: str=None):
+    def read(self, filenames: str | Iterable, encoding: str=None):
         """Read configuration from a filename or an iterable of filenames.
 
         Files that cannot be opened are silently ignored; this is
@@ -236,7 +236,7 @@ def read_string(self, string: str) -> None:
         parser = ConfigParser(interpolation=EnvExtendedInterpolation())
         parser.read_string(string)
         self.load_config(parser)
-    def read_dict(self, dictionary: Dict) -> None:
+    def read_dict(self, dictionary: dict) -> None:
         """Read configuration from a dictionary.
 
         Keys are section names, values are dictionaries with keys and values