Merge pull request #392 from GeospatialPython/Version_bumps

Don't run mypy in pre-commit.  Bump mypy to 2.1.0, & bump ruff

Author: JamesParrott

.github/workflows/speed_test.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         python-version: [
           "3.9",
-          "3.13",
+          "3.14",
         ]
         os: [
           "windows-latest",

.pre-commit-config.yaml

@@ -1,18 +1,14 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.7
+  rev: v0.15.13
   hooks:
     # Run the linter
     - id: ruff-check
       args: [ --fix ]
     # Run the formatter
     - id: ruff-format
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
     - id: check-yaml
     - id: trailing-whitespace
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.17.1
-  hooks:
-    - id: mypy

README.md

@@ -108,7 +108,7 @@ part of your geospatial project.
 
 ### URL Downloading
  - Unify tempfile creation and shapefile download logic.
- - Check "Content-Type" header and sniff initial bytes 
+ - Check "Content-Type" header and sniff initial bytes
    of response in order to possibly reject html responses, before parsing as a shapefile, to give a more useful error to users.
  - Special case shapefiles hosted in Github repos to suggest appending the query string `?raw=true`.
 

changelog.txt

@@ -16,7 +16,7 @@ VERSION 3.0.6
 2026-05-19
 	URL Downloading:
 	* Unify tempfile creation and shapefile download logic.
-	* Check "Content-Type" header and sniff initial bytes 
+	* Check "Content-Type" header and sniff initial bytes
 	of response in order to possibly reject html responses, before parsing as a shapefile, to give a more useful error to users.
 	* Special case shapefiles hosted in Github repos to suggest appending the query string `?raw=true`.
 

pyproject.toml

@@ -37,7 +37,7 @@ dev = [
     {include-group = "test"}
 ]
 lint = [
-    "mypy",
+    "mypy>=2.1.0",
     "pre-commit",
     "ruff",
 ]
@@ -48,6 +48,19 @@ test = [
 [project.urls]
 Repository = "https://github.com/GeospatialPython/pyshp"
 
+
+
+[tool.mypy]
+files=["src/shapefile.py"]
+mypy_path = "src"
+explicit_package_bases = true
+exclude_gitignore = true
+exclude=[
+    'test_shapefile\.py',
+    'run_benchmarks\.py',
+]
+
+
 [tool.hatch.build.targets.sdist]
 only-include = ["src", "shapefiles", "test_shapefile.py"]
 

run_benchmarks.py

@@ -47,8 +47,10 @@ def benchmark(
     return time_taken
 
 
-fields = {}
-shapeRecords = collections.defaultdict(list)
+fields: dict[str | PathLike, list[shapefile.Field]] = {}
+shapeRecords: dict[str | PathLike, list[shapefile.shapeRecord]] = (
+    collections.defaultdict(list)
+)
 
 
 def open_shapefile_with_PyShp(target: str | PathLike):

src/shapefile.py

@@ -2044,11 +2044,11 @@ def __setattr__(self, key: str, value: RecordValue) -> None:
             raise AttributeError(f"{key} is not a field name")
 
     @overload
-    def __getitem__(self, i: SupportsIndex) -> RecordValue: ...
+    def __getitem__(self, item: SupportsIndex) -> RecordValue: ...
     @overload
-    def __getitem__(self, s: slice) -> list[RecordValue]: ...
+    def __getitem__(self, item: slice) -> list[RecordValue]: ...
     @overload
-    def __getitem__(self, s: str) -> RecordValue: ...
+    def __getitem__(self, item: str) -> RecordValue: ...
     def __getitem__(
         self, item: SupportsIndex | slice | str
     ) -> RecordValue | list[RecordValue]: