Bump to minimum Python version to 3.10

Author: leonlan

.pre-commit-config.yaml

@@ -2,24 +2,22 @@ fail_fast: true
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
     -   id: debug-statements
         id: trailing-whitespace
         id: end-of-file-fixer
 
--   repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-    -   id: black
-
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.261'
+    rev: 'v0.12.8'
     hooks:
     -   id: ruff
+        types_or: [ python, pyi, jupyter ]
         args: [--fix]
+    -   id: ruff-format
+        types_or: [ python, pyi, jupyter ]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.2.0
+    rev: v1.17.1
     hooks:
     -   id: mypy

poetry.lock

@@ -19,7 +19,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Programming Language :: Python :: 3",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "numpy>=1.19.3; python_version < '3.12'",
     "numpy>=1.26.0; python_version >= '3.12'",
@@ -48,7 +48,7 @@ line-length = 79
 
 [tool.ruff.lint]
 select = [
-    "E", "F", "I", "NPY", "PYI", "Q", "RET", "RSE", "RUF", "SLF", "SIM", "TC"
+    "E", "F", "I", "NPY", "PYI", "Q", "RET", "RSE", "RUF", "SLF", "SIM", "TC",
 ]
 
 

pyproject.toml

@@ -1,14 +1,13 @@
 import os
 import warnings
 from pathlib import Path
-from typing import Union
 from urllib.request import urlopen
 
 from .constants import CVRPLIB_URL
 from .download_utils import find_set, is_vrptw
 
 
-def download_instance(name: str, path: Union[str, os.PathLike]):
+def download_instance(name: str, path: str | os.PathLike):
     """
     Downloads an instance file from CVRPLIB and saves it at the specified path.
 

vrplib/download/download_instance.py

@@ -1,14 +1,13 @@
 import os
 import warnings
 from pathlib import Path
-from typing import Union
 from urllib.request import urlopen
 
 from .constants import CVRPLIB_URL
 from .download_utils import find_set
 
 
-def download_solution(name: str, path: Union[str, os.PathLike]):
+def download_solution(name: str, path: str | os.PathLike):
     """
     Downloads a solution file from CVRPLIB and saves it at the specified path.
 

vrplib/download/download_solution.py

@@ -1,15 +1,14 @@
 import importlib.resources as pkg_resource
 import warnings
 from functools import lru_cache
-from typing import Optional
 
 from .download_utils import is_vrptw
 
 
 def list_names(
-    low: Optional[int] = None,
-    high: Optional[int] = None,
-    vrp_type: Optional[str] = None,
+    low: int | None = None,
+    high: int | None = None,
+    vrp_type: str | None = None,
 ):
     """
     Returns the names of the instances that can be downloaded from CVRPLIB.
@@ -40,7 +39,7 @@ def list_names(
     if vrp_type not in [None, "cvrp", "vrptw"]:
         raise ValueError("vrp_type must be one of [None, 'cvrp', 'vrptw']")
 
-    elif vrp_type == "cvrp":
+    if vrp_type == "cvrp":
         instances = filter(lambda inst: not is_vrptw(inst["name"]), instances)
 
     elif vrp_type == "vrptw":

vrplib/download/list_names.py

@@ -1,16 +1,15 @@
 from itertools import combinations
-from typing import Optional, Union
 
 import numpy as np
 
 
 def parse_distances(
     data: list[float],
     edge_weight_type: str,
-    edge_weight_format: Optional[str] = None,
-    node_coord: Optional[np.ndarray] = None,
-    comment: Optional[str] = None,
-    **kwargs: Union[float, str, np.ndarray],  # noqa
+    edge_weight_format: str | None = None,
+    node_coord: np.ndarray | None = None,
+    comment: str | None = None,
+    **kwargs: float | str | np.ndarray,
 ) -> np.ndarray:
     """
     Parses the distances. The specification "edge_weight_type" describes how
@@ -63,8 +62,7 @@ def parse_distances(
             # (C)VRPLIB format. Find a better way to identify Eilon instances.
             if comment is not None and "Eilon" in comment:
                 return from_eilon(data)
-            else:
-                return from_lower_row(data)
+            return from_lower_row(data)
 
         if edge_weight_format == "FULL_MATRIX":
             return np.array(data)

vrplib/parse/parse_distances.py

@@ -1,11 +1,9 @@
-from typing import Union
-
 import numpy as np
 
 from .parse_distances import pairwise_euclidean
 from .parse_utils import text2lines
 
-Instance = dict[str, Union[str, float, np.ndarray]]
+Instance = dict[str, str | float | np.ndarray]
 
 
 def parse_solomon(text: str, compute_edge_weights: bool = True) -> Instance:

vrplib/parse/parse_solomon.py

@@ -1,8 +1,6 @@
-from typing import Union
-
 from .parse_utils import infer_type, text2lines
 
-Solution = dict[str, Union[float, str, list]]
+Solution = dict[str, float | str | list]
 
 
 def parse_solution(text: str) -> Solution:

vrplib/parse/parse_solution.py

@@ -1,6 +1,3 @@
-from typing import Union
-
-
 def text2lines(text: str) -> list[str]:
     """
     Takes a string and returns a list of non-empty, stripped lines. Also
@@ -13,7 +10,7 @@ def text2lines(text: str) -> list[str]:
     ]
 
 
-def infer_type(s: str) -> Union[int, float, str]:
+def infer_type(s: str) -> int | float | str:
     try:
         return int(s)
     except ValueError: