ssb-sgis 1.2.15__tar.gz → 1.2.17__tar.gz

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.2.15
+Version: 1.2.17
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
@@ -17,7 +17,6 @@ Classifier: Topic :: Scientific/Engineering :: GIS
 Provides-Extra: all
 Provides-Extra: bucket
 Provides-Extra: test
-Provides-Extra: torch
 Provides-Extra: xarray
 Requires-Dist: affine (>=2.4.0)
 Requires-Dist: branca (>=0.6.0)
@@ -35,7 +34,7 @@ Requires-Dist: mapclassify (>=2.5.0)
 Requires-Dist: matplotlib (>=3.7.0)
 Requires-Dist: networkx (>=3.0)
 Requires-Dist: numpy (>=1.26.4)
-Requires-Dist: pandas (>=2.2.1)
+Requires-Dist: pandas (>=2.0.1)
 Requires-Dist: pyarrow (>=11.0.0)
 Requires-Dist: pyproj (>=3.6.1)
 Requires-Dist: rasterio (>=1.3.8)
@@ -44,8 +43,6 @@ Requires-Dist: rioxarray (>=0.15.5) ; extra == "all" or extra == "xarray" or ext
 Requires-Dist: rtree (>=1.0.1)
 Requires-Dist: scikit-learn (>=1.2.1)
 Requires-Dist: shapely (>=2.0.1)
-Requires-Dist: torch (>=2.4.0) ; extra == "all" or extra == "torch" or extra == "test"
-Requires-Dist: torchgeo (>=0.5.2) ; extra == "all" or extra == "torch" or extra == "test"
 Requires-Dist: typing-extensions (>=4.11.0)
 Requires-Dist: xarray (>=2024.3.0) ; extra == "all" or extra == "xarray" or extra == "test"
 Requires-Dist: xyzservices (>=2023.2.0)
@@ -98,7 +95,7 @@ pip install ssb-sgis
 
 The sgis package has the following optional dependencies:
 
-- bucket: For working with files stored in GCP buckets
+- bucket: For working with files stored in GCS buckets
 - torch: Use functionality from PyTorch and torchgeo
 - xarray: Use functionality from xarray and rioxarray
 - test: Packages needed for running pytest

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/README.md

@@ -42,7 +42,7 @@ pip install ssb-sgis
 
 The sgis package has the following optional dependencies:
 
-- bucket: For working with files stored in GCP buckets
+- bucket: For working with files stored in GCS buckets
 - torch: Use functionality from PyTorch and torchgeo
 - xarray: Use functionality from xarray and rioxarray
 - test: Packages needed for running pytest

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.15"
+version = "1.2.17"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -21,7 +21,6 @@ Changelog = "https://github.com/statisticsnorway/ssb-sgis/releases"
 python = ">=3.10,<4"
 affine = ">=2.4.0"
 branca = ">=0.6.0"
-dask = { version = ">=2024.1.1", optional = true }
 folium = ">=0.14.0"
 geopandas = ">=0.14.0"
 igraph = ">=0.11.2"
@@ -33,7 +32,7 @@ mapclassify = ">=2.5.0"
 matplotlib = ">=3.7.0"
 networkx = ">=3.0"
 numpy = ">=1.26.4"
-pandas = ">=2.2.1"
+pandas = ">=2.0.1"
 pyarrow = ">=11.0.0"
 pyproj = ">=3.6.1"
 rasterio = ">=1.3.8"
@@ -43,19 +42,17 @@ scikit-learn = ">=1.2.1"
 shapely = ">=2.0.1"
 typing-extensions = ">=4.11.0"
 xyzservices = ">=2023.2.0"
+dask = { version = ">=2024.1.1", optional = true }
 xarray = { version = ">=2024.3.0", optional = true }
 rioxarray = { version = ">=0.15.5", optional = true }
-torch = { version = ">=2.4.0", optional = true }
-torchgeo = { version = ">=0.5.2", optional = true }
 dapla-toolbelt = { version = ">=3.0.1", optional = true }
 gcsfs = { version = ">=2024.3.1", optional = true }
 
 [tool.poetry.extras]
-all = ["pyogrio", "xarray", "rioxarray", "torch", "torchgeo", "dapla-toolbelt", "gcsfs", "dask"]
+all = ["pyogrio", "xarray", "rioxarray", "dapla-toolbelt", "gcsfs", "dask"]
 bucket = ["dapla-toolbelt", "gcsfs"]
-torch = ["torch", "torchgeo"]
 xarray = ["xarray", "rioxarray"]
-test = ["xarray", "rioxarray", "torch", "torchgeo", "dask"]
+test = ["xarray", "rioxarray", "dask"]
 
 [tool.poetry.group.dev.dependencies]
 pygments = ">=2.10.0"

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/geopandas_tools/conversion.py

@@ -507,7 +507,7 @@ def to_gdf(
             geoseries = GeoSeries(_make_shapely_geoms(obj.iloc[:, 0]), index=index)
         return GeoDataFrame({key: geoseries}, geometry=key, crs=crs, **kwargs)
 
-    if geometry and geom_col not in obj or isinstance(obj, pd.DataFrame):
+    if (geometry and geom_col not in obj) or isinstance(obj, pd.DataFrame):
         raise ValueError("Cannot find geometry column(s)", geometry)
 
     # geojson, __geo_interface__
@@ -595,10 +595,8 @@ def is_nested_geojson(obj: Any) -> bool:
 
 def get_crs_from_dict(obj: Any) -> CRS | None | Any:
     """Try to extract the 'crs' attribute of the object or an object in the object."""
-    if (
-        not hasattr(obj, "__iter__")
-        or not is_dict_like(obj)
-        and not is_dict_like(obj[0])
+    if not hasattr(obj, "__iter__") or (
+        not is_dict_like(obj) and not is_dict_like(obj[0])
     ):
         return None
 

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/io/dapla_functions.py

@@ -932,6 +932,7 @@ def _get_files_in_subfolders(folderinfo: list[dict]) -> list[tuple]:
 
 
 def _maybe_strip_prefix(path, file_system):
+    """Strip gcs prefix only if file_system is GCS."""
     if isinstance(file_system, GCSFileSystem) and path.startswith("gs://"):
         return path.replace("gs://", "")
     return path

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/maps/examine.py

@@ -121,10 +121,8 @@ class Examine:
             )
 
         if sort_values is not None:
-            if (
-                sort_values == "area"
-                or not isinstance(sort_values, str)
-                and "area" in sort_values
+            if sort_values == "area" or (
+                not isinstance(sort_values, str) and "area" in sort_values
             ):
                 self.mask_gdf["area"] = self.mask_gdf.area
             self.mask_gdf = self.mask_gdf.sort_values(sort_values)

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/maps/map.py

@@ -543,8 +543,10 @@ class Map:
         def is_maybe_km2():
             if "area" in self._column and (
                 "km2" in self._column
-                or "kilomet" in self._column
-                and ("sq" in self._column or "2" in self._column)
+                or (
+                    "kilomet" in self._column
+                    and ("sq" in self._column or "2" in self._column)
+                )
             ):
                 return True
             else:

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/networkanalysis/networkanalysisrules.py

@@ -209,15 +209,15 @@ class NetworkAnalysisRules:
             return True
 
     def _validate_weight(self, gdf: GeoDataFrame) -> GeoDataFrame:
-        if "meter" in self.weight or "metre" in self.weight and unit_is_meters(gdf):
+        if "meter" in self.weight or ("metre" in self.weight and unit_is_meters(gdf)):
             if self.nodedist_kmh:
                 raise ValueError("Cannot set 'nodedist_kmh' when 'weight' is meters.")
             gdf[self.weight] = gdf.length
             return gdf
 
         # allow abbreviation of 'minutes' to be nice
-        elif (
-            self.weight == "min" or "minut" in self.weight and "minutes" in gdf.columns
+        elif self.weight == "min" or (
+            "minut" in self.weight and "minutes" in gdf.columns
         ):
             if self.nodedist_multiplier:
                 raise ValueError(

{ssb_sgis-1.2.15 → ssb_sgis-1.2.17}/src/sgis/raster/image_collection.py

@@ -629,6 +629,8 @@ class _ImageBase:
         for key, value in self.__dict__.items():
             if key.startswith("_"):
                 continue
+            if key == "file_system" and type(value) is type(getattr(other, key)):
+                continue
             if value != getattr(other, key):
                 print(key, value, getattr(other, key))
                 return False
@@ -747,9 +749,8 @@ class _ImageBandBase(_ImageBase):
                         continue
                     if results is not None:
                         break
-                elif (
-                    isinstance(value, str)
-                    or hasattr(value, "__iter__")
+                elif isinstance(value, str) or (
+                    hasattr(value, "__iter__")
                     and all(isinstance(x, str | re.Pattern) for x in value)
                 ):
                     try:
@@ -1538,9 +1539,8 @@ class Image(_ImageBandBase):
         else:
             self._all_file_paths = None
 
-        if (
-            self.metadata is None
-            or not len(self.metadata)
+        if self.metadata is None or (
+            not len(self.metadata)
             and "metadata.json" in {Path(x).name for x in self._all_file_paths}
         ):
             with _open_func(
@@ -1845,7 +1845,8 @@ class Image(_ImageBandBase):
         if (
             self.filename_patterns
             and any(_get_non_optional_groups(pat) for pat in self.filename_patterns)
-            or self.image_patterns
+        ) or (
+            self.image_patterns
             and any(_get_non_optional_groups(pat) for pat in self.image_patterns)
         ):
             self._bands = [band for band in self._bands if band.band_id is not None]
@@ -1882,8 +1883,7 @@ class Image(_ImageBandBase):
                 for group in sort_groups
                 for pat in self.filename_patterns
             )
-            or all(band.band_id is not None for band in self)
-        )
+        ) or all(band.band_id is not None for band in self)
 
     @property
     def tile(self) -> str:
@@ -2846,17 +2846,21 @@ class ImageCollection(_ImageBase):
         """True if the ImageCollection has regexes that should make it sortable by date."""
         sort_group = "date"
         return (
-            self.filename_patterns
-            and any(
-                sort_group in pat.groupindex
-                and sort_group in _get_non_optional_groups(pat)
-                for pat in self.filename_patterns
+            (
+                self.filename_patterns
+                and any(
+                    sort_group in pat.groupindex
+                    and sort_group in _get_non_optional_groups(pat)
+                    for pat in self.filename_patterns
+                )
             )
-            or self.image_patterns
-            and any(
-                sort_group in pat.groupindex
-                and sort_group in _get_non_optional_groups(pat)
-                for pat in self.image_patterns
+            or (
+                self.image_patterns
+                and any(
+                    sort_group in pat.groupindex
+                    and sort_group in _get_non_optional_groups(pat)
+                    for pat in self.image_patterns
+                )
             )
             or all(getattr(img, sort_group) is not None for img in self)
         )