Update pre-commit to python 3.10

README.md

@@ -21,18 +21,13 @@ For additional documentation see
 
 # Installation
 
-pgeocode requires Python 3.8+ as well as `numpy` and `pandas` packages.
+pgeocode requires Python 3.10+ as well as `numpy` and `pandas` packages.
 It can be installed with,
 
 ```
 pip install pgeocode
 ```
 
-or
-
-```
-conda install -c conda-forge pgeocode
-```
 
 # Quickstart
 
@@ -142,6 +137,8 @@ repository for examples of data files.
 
 The pgeocode package is distributed under the 3-clause BSD license.
 
+The pgeocode package is maintained by [Symerio](https://www.symerio.com).
+
 # Supported countries
 
 The list of countries available in the GeoNames database, with the
@@ -173,4 +170,4 @@ Uruguay (UY), Holy See (VA), United States Virgin Islands (VI), Wallis
 and Futuna Islands (WF), Mayotte (YT), South Africa (ZA)
 
 See [GeoNames database](http://download.geonames.org/export/zip/) for
-more information.  The pgeocode package is maintained by [Symerio](https://www.symerio.com).
+more information.

pgeocode.py

@@ -7,7 +7,7 @@
 import urllib.request
 import warnings
 from io import BytesIO
-from typing import Any, List, Optional, Tuple
+from typing import Any
 from zipfile import ZipFile
 
 import numpy as np
@@ -182,7 +182,7 @@ def _open_extract_url(url: str, country: str) -> Any:
 
 
 @contextlib.contextmanager
-def _open_extract_cycle_url(urls: List[str], country: str) -> Any:
+def _open_extract_cycle_url(urls: list[str], country: str) -> Any:
     """Same as _open_extract_url but cycle through URLs until one works
 
     We start by opening the first URL in the list, and if fails
@@ -245,7 +245,7 @@ def __init__(self, country: str = "fr", unique: bool = True):
         self.unique = unique
 
     @staticmethod
-    def _get_data(country: str) -> Tuple[str, pd.DataFrame]:
+    def _get_data(country: str) -> tuple[str, pd.DataFrame]:
         """Load the data from disk; otherwise download and save it"""
 
         data_path = os.path.join(STORAGE_DIR, country.upper() + ".txt")
@@ -349,7 +349,7 @@ def query_location(
         self,
         name: str,
         top_k: int = 100,
-        fuzzy_threshold: Optional[int] = None,
+        fuzzy_threshold: int | None = None,
         col: str = "place_name",
     ) -> pd.DataFrame:
         """Get location information from a place name

pyproject.toml

@@ -2,7 +2,7 @@
 requires = ["setuptools>=42", "wheel"]
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [
@@ -20,7 +20,7 @@ select = [
 ignore = ["E402", "E501", "E731", "E741"]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.10"
 show_error_codes = true
 warn_unreachable = true
 

test_pgeocode.py

@@ -175,7 +175,7 @@ def test_haversine_distance():
     y = x * rng.rand(N, 2)
 
     d_ref = np.zeros(N)
-    for idx, (x_coord, y_coord) in enumerate(zip(x, y)):
+    for idx, (x_coord, y_coord) in enumerate(zip(x, y, strict=False)):
         d_ref[idx] = great_circle(x_coord, y_coord).km
 
     d_pred = haversine_distance(x, y)