morecantile 6.1.0__tar.gz → 6.2.0__tar.gz

{morecantile-6.1.0 → morecantile-6.2.0}/.pre-commit-config.yaml

@@ -4,26 +4,21 @@ repos:
     hooks:
       - id: validate-pyproject
 
-  - repo: https://github.com/psf/black
-    rev: 22.12.0
-    hooks:
-      - id: black
-        language_version: python
-
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         language_version: python
 
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.238
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.5
     hooks:
       - id: ruff
         args: ["--fix"]
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.1
+    rev: v1.11.2
     hooks:
       - id: mypy
         language_version: python

{morecantile-6.1.0 → morecantile-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: morecantile
-Version: 6.1.0
+Version: 6.2.0
 Summary: Construct and use map tile grids (a.k.a TileMatrixSet / TMS).
 Keywords: GIS,TMS,TileMatrixSet,Map Tile
 Author-email: Vincent Sarago <vincent@developmentseed.com>
@@ -14,9 +14,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Dist: attrs
-Requires-Dist: pyproj~=3.1
+Requires-Dist: pyproj>=3.1,<4.0
 Requires-Dist: pydantic~=2.0
 Requires-Dist: pytest ; extra == "benchmark"
 Requires-Dist: pytest-benchmark ; extra == "benchmark"

{morecantile-6.1.0 → morecantile-6.2.0}/morecantile/__init__.py

@@ -8,7 +8,7 @@ Refs:
 
 """
 
-__version__ = "6.1.0"
+__version__ = "6.2.0"
 
 from .commons import BoundingBox, Coords, Tile  # noqa
 from .defaults import TileMatrixSets, tms  # noqa

{morecantile-6.1.0 → morecantile-6.2.0}/morecantile/defaults.py

@@ -55,7 +55,7 @@ class TileMatrixSets:
         """Register TileMatrixSet(s)."""
         for identifier in custom_tms.keys():
             if identifier in self.tms and not overwrite:
-                raise Exception(f"{identifier} is already a registered TMS.")
+                raise InvalidIdentifier(f"{identifier} is already a registered TMS.")
 
         return TileMatrixSets({**self.tms, **custom_tms})
 

{morecantile-6.1.0 → morecantile-6.2.0}/morecantile/models.py

@@ -510,6 +510,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
                 "Could not create coordinate Transformer from input CRS to the given geographic CRS"
                 "some methods might not be available.",
                 UserWarning,
+                stacklevel=1,
             )
             self._to_geographic = None
             self._from_geographic = None
@@ -537,10 +538,8 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     def is_variable(self) -> bool:
         """Check if TMS has variable width matrix."""
         return any(
-            [
-                True if matrix.variableMatrixWidths is not None else False
-                for matrix in self.tileMatrices
-            ]
+            True if matrix.variableMatrixWidths is not None else False
+            for matrix in self.tileMatrices
         )
 
     def __iter__(self):
@@ -800,6 +799,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         warnings.warn(
             f"TileMatrix not found for level: {zoom} - Creating values from TMS Scale.",
             UserWarning,
+            stacklevel=1,
         )
 
         # TODO: what if we want to construct a matrix for a level up ?
@@ -894,6 +894,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             warnings.warn(
                 f"Point ({x}, {y}) is outside TMS bounds {list(self.xy_bbox)}.",
                 PointOutsideTMSBounds,
+                stacklevel=1,
             )
 
         lng, lat = self._to_geographic.transform(x, y)
@@ -913,6 +914,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             warnings.warn(
                 f"Point ({lng}, {lat}) is outside TMS bounds {list(self.bbox)}.",
                 PointOutsideTMSBounds,
+                stacklevel=1,
             )
 
         x, y = self._from_geographic.transform(lng, lat)
@@ -1372,6 +1374,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
                 "CRS is no longer part of the GeoJSON specification."
                 "Other projection than EPSG:4326 might not be supported.",
                 UserWarning,
+                stacklevel=1,
             )
             feat.update(
                 {

{morecantile-6.1.0 → morecantile-6.2.0}/morecantile/utils.py

@@ -118,12 +118,10 @@ def is_power_of_two(number: int) -> bool:
 def check_quadkey_support(tms: List) -> bool:
     """Check if a Tile Matrix Set supports quadkeys"""
     return all(
-        [
-            (t.matrixWidth == t.matrixHeight)
-            and is_power_of_two(t.matrixWidth)
-            and ((t.matrixWidth * 2) == tms[i + 1].matrixWidth)
-            for i, t in enumerate(tms[:-1])
-        ]
+        (t.matrixWidth == t.matrixHeight)
+        and is_power_of_two(t.matrixWidth)
+        and ((t.matrixWidth * 2) == tms[i + 1].matrixWidth)
+        for i, t in enumerate(tms[:-1])
     )
 
 

{morecantile-6.1.0 → morecantile-6.2.0}/pyproject.toml

@@ -17,12 +17,13 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering :: GIS",
 ]
 dynamic = ["version"]
 dependencies = [
     "attrs",
-    "pyproj~=3.1",
+    "pyproj>=3.1,<4.0",
     "pydantic~=2.0",
 ]
 
@@ -95,7 +96,7 @@ default_section = "THIRDPARTY"
 [tool.mypy]
 no_strict_optional = true
 
-[tool.ruff]
+[tool.ruff.lint]
 select = [
     "D1",  # pydocstyle errors
     "E",  # pycodestyle errors
@@ -110,7 +111,7 @@ ignore = [
     "B905",  # ignore zip() without an explicit strict= parameter, only support with python >3.10
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/*.py" = ["D1"]
 
 
@@ -120,7 +121,7 @@ filterwarnings = [
 ]
 
 [tool.bumpversion]
-current_version = "6.1.0"
+current_version = "6.2.0"
 
 search = "{current_version}"
 replace = "{new_version}"