ssb-sgis 1.1.7__py3-none-any.whl → 1.1.8__py3-none-any.whl

sgis/io/dapla_functions.py

@@ -128,7 +128,7 @@ def read_geopandas(
         return gpd.GeoDataFrame(
             _read_partitioned_parquet(
                 gcs_path,
-                read_func=_read_geopandas,
+                read_func=pq.read_table,
                 file_system=file_system,
                 mask=mask,
                 filters=filters,
@@ -145,7 +145,7 @@ def read_geopandas(
         read_func = gpd.read_file
 
     with file_system.open(gcs_path, mode="rb") as file:
-        df = _read_geopandas(
+        return _read_geopandas(
             file,
             read_func=read_func,
             file_format=file_format,
@@ -153,8 +153,6 @@ def read_geopandas(
             **kwargs,
         )
 
-    return df
-
 
 def _read_geopandas_from_iterable(
     paths, mask, file_system, use_threads, pandas_fallback, **kwargs
@@ -763,17 +761,16 @@ def _read_partitioned_parquet(
 
     if results:
         if all(isinstance(x, DataFrame) for x in results):
-            results = pd.concat(results)
+            return pd.concat(results)
         else:
             geo_metadata = _get_geo_metadata(next(iter(child_paths)), file_system)
-            results = _arrow_to_geopandas(
+            return _arrow_to_geopandas(
                 pyarrow.concat_tables(
                     results,
                     promote_options="permissive",
                 ),
                 geo_metadata,
             )
-        return results
 
     # add columns to empty DataFrame
     first_path = next(iter(child_paths + [path]))

{ssb_sgis-1.1.7.dist-info → ssb_sgis-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.1.7
+Version: 1.1.8
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.1.7.dist-info → ssb_sgis-1.1.8.dist-info}/RECORD

@@ -21,7 +21,7 @@ sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhme
 sgis/helpers.py,sha256=_h7ke9hJrRNhHW-ZX3gA95fOrX2s1ADKBMxc94p2F4Q,9627
 sgis/io/__init__.py,sha256=uyBr20YDqB2bQttrd5q1JuGOvX32A-MSvS7Wmw5f5qg,177
 sgis/io/_is_dapla.py,sha256=wmfkSe98IrLhUg3dtXZusV6OVC8VlY1kbc5EQDf3P-Q,358
-sgis/io/dapla_functions.py,sha256=JrMmgdFPgXYUDMCzZcWLv2NyDuzUjwxCkHUC8QiBazQ,30067
+sgis/io/dapla_functions.py,sha256=W7FNZErQb9j9iHRk5sui2cP2uHr136rrmRrpP2CFixc,30023
 sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,7 +59,7 @@ sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
 sgis/raster/regex.py,sha256=kYhVpRYzoXutx1dSYmqMoselWXww7MMEsTPmLZwHjbM,3759
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.1.7.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.7.dist-info/METADATA,sha256=c-fXSCy0eK6NKycntm8iC0GpuM_J2xTnXcdTV8tnmzM,11740
-ssb_sgis-1.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.7.dist-info/RECORD,,
+ssb_sgis-1.1.8.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.8.dist-info/METADATA,sha256=dwqSmleqbejdaqfpBPfqbVSb0W_PIIQ0adnXiK7ILV0,11740
+ssb_sgis-1.1.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.8.dist-info/RECORD,,