lint cleanups

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
     - uses: actions/checkout@v4
       with:
@@ -40,10 +40,10 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.14"
     - name: Install Dependencies
       run: |
-        pip install wheel setuptools
+        pip install wheel setuptools build
     - name: Build distribution
       run: >-
         make dist

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: "^docs/conf.py"
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -18,7 +18,7 @@ repos:
     args: ['--fix=auto']
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.11
+  rev: v0.15.20
   hooks:
-    - id: ruff
+    - id: ruff-check
     - id: ruff-format

Makefile

@@ -11,11 +11,11 @@ lint:
 
 .PHONY: install
 install:
-	pip3 install --editable .
+	pip install --editable .
 
-dist: smart_importer setup.cfg setup.py
+dist: smart_importer pyproject.toml
 	rm -rf dist
-	python setup.py sdist bdist_wheel
+	python -m build
 
 # Before making a release, CHANGES needs to be updated and
 # a tag and GitHub release should be created too.

pyproject.toml

@@ -1,5 +1,47 @@
+[project]
+name = "smart_importer"
+description = "Augment Beancount importers with machine learning functionality."
+readme = "README.rst"
+requires-python = ">=3.10"
+license = "MIT"
+authors = [{ name = "Johannes Harms" }]
+keywords = ["fava", "beancount", "accounting", "machinelearning"]
+classifiers = [
+  "Development Status :: 1 - Planning",
+  "Environment :: Web Environment",
+  "Environment :: Console",
+  "Intended Audience :: Education",
+  "Intended Audience :: End Users/Desktop",
+  "Intended Audience :: Financial and Insurance Industry",
+  "Intended Audience :: Information Technology",
+  "Natural Language :: English",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
+  "Topic :: Office/Business :: Financial :: Accounting",
+  "Topic :: Office/Business :: Financial :: Investment",
+]
+dependencies = [
+  "beancount>=3",
+  "beangulp",
+  "scikit-learn>=1.0",
+  "numpy>=1.18.0",
+  "typing-extensions>=4.9",
+]
+dynamic = ["version"]
+
+[project.urls]
+Homepage = "https://github.com/beancount/smart_importer"
+Issues = "https://github.com/beancount/smart_importer/issues"
+
+[tool.setuptools.packages.find]
+exclude = ["tests"]
+
 [build-system]
-requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"]
+requires = ["setuptools>=80", "setuptools_scm[simple]>=8"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
@@ -21,7 +63,6 @@ module = ["beangulp.*"]
 follow_untyped_imports = true
 
 [tool.ruff]
-target-version = "py38"
 line-length = 79
 
 [tool.ruff.lint]
@@ -30,3 +71,9 @@ extend-select = [
     "UP",  # pyupgrade
     "TC",  # type-checking
 ]
+
+[tool.pylint.'messages control']
+disable = [
+  "too-few-public-methods",
+  "cyclic-import",
+]

smart_importer/predictor.py

@@ -6,7 +6,7 @@
 
 import logging
 import threading
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from beancount.core.data import (
     Close,
@@ -26,6 +26,8 @@
 from smart_importer.wrapper import ImporterWrapper
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from beancount.core import data
     from beangulp.importer import Importer
     from sklearn import Pipeline

tests/data_test.py

@@ -7,7 +7,7 @@
 import os
 import pprint
 import re
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 import pytest
 from beancount.core.compare import stable_hash_namedtuple
@@ -18,6 +18,8 @@
 from .predictors_test import DummyImporter
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from beancount.core import data