lint, run ci on pr, update pre-commit

Author: Dobatymo

.github/workflows/pythonpackage.yml

@@ -1,6 +1,10 @@
 name: Python package
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches:
+    - master
 
 jobs:
 
@@ -25,11 +29,13 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2019]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        os: [ubuntu-20.04, macos-13, windows-2019]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         exclude:
         - os: windows-2019
           python-version: '3.12'
+        - os: windows-2019
+          python-version: '3.13'
     runs-on: ${{ matrix.os }}
 
     steps:

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -23,30 +23,30 @@ repos:
   - id: pretty-format-yaml
     args: [--autofix]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: 1.8.0
+  rev: 2.2.4
   hooks:
   - id: pyproject-fmt
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.2
+  rev: v3.16.0
   hooks:
   - id: pyupgrade
     args: [--py37-plus]
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.4.2
+  rev: 24.8.0
   hooks:
   - id: black
 - repo: https://github.com/PyCQA/isort
   rev: 5.13.2
   hooks:
   - id: isort
 - repo: https://github.com/PyCQA/bandit
-  rev: 1.7.8
+  rev: 1.7.10
   hooks:
   - id: bandit
     args: [-c, pyproject.toml]
     additional_dependencies: ['.[toml]']
 - repo: https://github.com/pycqa/flake8
-  rev: 7.0.0
+  rev: 7.1.1
   hooks:
   - id: flake8
     additional_dependencies:
@@ -56,14 +56,14 @@ repos:
     - flake8-mutable
     - flake8-simplify
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.0
+  rev: v1.13.0
   hooks:
   - id: mypy
     args: [--ignore-missing-imports, --install-types, --non-interactive]
     additional_dependencies:
     - lmdb==1.4.1
     - typing-extensions>=4.0.0
 - repo: https://github.com/Yelp/detect-secrets
-  rev: v1.4.0
+  rev: v1.5.0
   hooks:
   - id: detect-secrets

benchmark.py

@@ -9,10 +9,10 @@
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from contextlib import closing, suppress
+from importlib import import_module
 from random import randrange
 from typing import Any, Callable, ContextManager, DefaultDict, Dict, Iterable, List, Sequence, TextIO
 
-from importlib import import_module
 from genutility.iter import batch
 from genutility.time import MeasureTime
 from pytablewriter import MarkdownTableWriter
@@ -40,12 +40,12 @@ def __init__(self, db_tpl, db_type, db_module):
         self.combined = -1
 
     def load_module(self, name):
-        """"Load module and ignore benchmark if module is unavailable"""
+        """ "Load module and ignore benchmark if module is unavailable"""
         if name is None or name in sys.modules:
             return True
 
         try:
-            globals()[name.split('.')[-1]] = import_module(name)
+            globals()[name.split(".")[-1]] = import_module(name)
             print(f"Loaded module {name}")
         except ImportError:
             return False
@@ -293,7 +293,7 @@ def __init__(self, db_tpl):
         super().__init__(db_tpl, "shelve", "shelve")
 
     def open(self):
-        return shelve.open(self.path)
+        return shelve.open(self.path)  # nosec B301
 
 
 class VedisBenchmark(JsonEncodedBenchmark):

pyproject.toml

@@ -1,14 +1,14 @@
 [build-system]
 build-backend = "flit_core.buildapi"
 requires = [
-  "flit_core<4,>=3.2",
+  "flit-core<4,>=3.2",
 ]
 
 [project]
 name = "lmdbm"
 readme = "readme.md"
-authors = [{name = "Dobatymo", email = "Dobatymo@users.noreply.github.com"}]
-requires-python = ">= 3.7"
+authors = [ { name = "Dobatymo", email = "Dobatymo@users.noreply.github.com" } ]
+requires-python = ">=3.7"
 classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: ISC License (ISCL)",
@@ -20,6 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Topic :: Database",
 ]
 dynamic = [
@@ -30,8 +31,7 @@ dependencies = [
   "lmdb",
   "typing-extensions>=4",
 ]
-[project.optional-dependencies]
-bench = [
+optional-dependencies.bench = [
   "genutility[iter,rich,time]>=0.0.103",
   "pysos==1.2.9",
   "pytablewriter==0.63",
@@ -41,11 +41,10 @@ bench = [
   "unqlite==0.9.2",
   "vedis==0.7.1",
 ]
-test = [
+optional-dependencies.test = [
   "genutility[test]",
 ]
-[project.urls]
-Home = "https://github.com/Dobatymo/lmdb-python-dbm"
+urls.Home = "https://github.com/Dobatymo/lmdb-python-dbm"
 
 [tool.black]
 line-length = 120
@@ -58,4 +57,4 @@ profile = "black"
 line_length = 120
 
 [tool.bandit]
-skips = ["B101"]
+skips = [ "B101" ]

readme.md

@@ -43,9 +43,10 @@ As of `lmdb==1.2.1` the docs say that calling `lmdb.Environment.set_mapsize` fro
 
 ## Benchmarks
 
-See `benchmark.py` and `requirements-bench.txt`. Other storage engines which could be tested: `wiredtiger`, `berkeleydb`.
+Install `lmdbm[bench]` and run `benchmark.py`. Other storage engines which could be tested: `wiredtiger`, `berkeleydb`.
+
 Storage engines not benchmarked:
-	- `tinydb` (because it doesn't have built-in str/bytes keys)
+- `tinydb` (because it doesn't have built-in str/bytes keys)
 
 ### continuous writes in seconds (best of 3)
 | items | lmdbm  |lmdbm-batch|pysos |sqlitedict|sqlitedict-batch|dbm.dumb|semidbm|vedis |vedis-batch|unqlite|unqlite-batch|

tox.ini

@@ -3,3 +3,5 @@ max-line-length = 120
 select = B, E7, E9, W2, W3, W6, F
 ignore = E704
 exclude = .git,.mypy_cache,__pycache__,build,dist
+per-file-ignores =
+    benchmark.py:F821