diff --git a/gdecore/database_queries.py b/gdecore/database_queries.py index 779672638d1111f0a61eb70d76ab8c127aa9d3b4..f0c4c08742725acffd9fc267ef1689437e4c48f4 100644 --- a/gdecore/database_queries.py +++ b/gdecore/database_queries.py @@ -21,6 +21,7 @@ import numpy import shapely import pandas import geopandas +import warnings from gdeimporter.tools.database import Database @@ -390,12 +391,17 @@ class DatabaseQueries: db_obm_buildings = Database(**db_obm_buildings_config) db_obm_buildings.create_connection_and_cursor() - obm_buildings = geopandas.GeoDataFrame.from_postgis( - sql_query % (db_table, "4326", geographic_area, occupancy_types_condition), - db_obm_buildings.connection, - geom_col="geometry", - crs="epsg:4326", - ) + with warnings.catch_warnings(): + # Ignore warning for non-SQLAlchemy Connection + # (see github.com/pandas-dev/pandas/issues/45660) + warnings.simplefilter("ignore", UserWarning) + + obm_buildings = geopandas.GeoDataFrame.from_postgis( + sql_query % (db_table, "4326", geographic_area, occupancy_types_condition), + db_obm_buildings.connection, + geom_col="geometry", + crs="epsg:4326", + ) db_obm_buildings.close_connection() diff --git a/tests/data/exposure_entities.txt b/tests/data/exposure_entities.txt index 959d0f006ad3a44f8d574223fb18f9b29ac989d2..3610519bc22cf1c63aaac87436a989fd78a575ec 100644 --- a/tests/data/exposure_entities.txt +++ b/tests/data/exposure_entities.txt @@ -1,3 +1,3 @@ Spain -Turkey +Switzerland Germany \ No newline at end of file diff --git a/tests/test_configuration.py b/tests/test_configuration.py index eabcd397f816589e1ae1ee1cd049d17d60b011b5..4054f851ce569e65a2708ea76e8896f5dfb194fc 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -100,7 +100,7 @@ def test_Configuration_interpret_exposure_entities_to_run(test_db): returned_config.interpret_exposure_entities_to_run() assert len(returned_config.exposure_entities_to_run) == 3 assert returned_config.exposure_entities_to_run[0] == "ESP" - assert returned_config.exposure_entities_to_run[1] == "TUR" + assert returned_config.exposure_entities_to_run[1] == "CHE" assert returned_config.exposure_entities_to_run[2] == "DEU" # A name of a CSV file is provided, 'exposure_entities_code' is ISO3