Merge pull request #405 from openclimatefix/bug/400-pandas-loc

add .copy and warnings go away

Author: peterdudfield

nowcasting_dataset/data_sources/gsp/eso.py

@@ -158,7 +158,7 @@ def get_gsp_shape_from_eso(
     if join_duplicates:
         logger.debug("Removing duplicates by joining geometry together")
 
-        shape_gpd_no_duplicates = shape_gpd.drop_duplicates(subset=["RegionID"])
+        shape_gpd_no_duplicates = shape_gpd.drop_duplicates(subset=["RegionID"]).copy()
         duplicated_raw = shape_gpd[shape_gpd["RegionID"].duplicated()]
 
         for _, duplicate in duplicated_raw.iterrows():
@@ -171,7 +171,6 @@ def get_gsp_shape_from_eso(
             new_geometry = shape_gpd_no_duplicates.loc[index_other, "geometry"].union(
                 duplicate.geometry
             )
-
             # set new geometry
             shape_gpd_no_duplicates.loc[index_other, "geometry"] = new_geometry
 

tests/data_sources/test_pv_data_source.py

@@ -31,8 +31,8 @@ def test_get_example_and_batch():  # noqa: D103
         meters_per_pixel=2000,
         filename=PV_DATA_FILENAME,
         metadata_filename=PV_METADATA_FILENAME,
-        start_dt=datetime.fromisoformat("2019-01-01 00:00:00.000+00:00"),
-        end_dt=datetime.fromisoformat("2019-01-02 00:00:00.000+00:00"),
+        start_dt=datetime.fromisoformat("2019-01-01 00:00:00.000"),
+        end_dt=datetime.fromisoformat("2019-01-02 00:00:00.000"),
         load_azimuth_and_elevation=False,
         load_from_gcs=False,
     )