From 6bde6e3be9950a783535448c8b4d463aa0726302 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Wed, 28 Jan 2026 16:11:12 +0100 Subject: [PATCH 1/4] lint to black 26 --- setup.py | 1 - src/ref_geo/__init__.py | 1 - src/ref_geo/env.py | 1 - src/ref_geo/migrations/utils.py | 47 ++++++------------- ...5a0ae652c13_ref_geo_french_regions_1970.py | 1 - ...dbfbccd63_ref_geo_french_municipalities.py | 31 ++++-------- .../10a587fb63d1_ref_geo_inpn_grids_20.py | 7 +-- .../175cdb17343f_ref_geo_inpn_grids_2.py | 6 +-- ...9_rewrite_fct_get_altitude_intersection.py | 13 ++--- .../31ca7fd0d2ea_added_l_areas_description.py | 1 - ...3fdaa1805575_ref_geo_french_departments.py | 25 ++++------ .../4882d6141a41_add_regions_in_area_types.py | 1 - .../4d0c35ea0cfe_ref_geo_inpn_grids_50.py | 7 +-- .../557aadcf2e45_add_missing_size_hierachy.py | 13 ++--- .../586613e2faeb_ref_geo_inpn_grids_1.py | 1 - .../681306b27407_fix_altitude_trigger.py | 13 ++--- .../versions/6afe74833ed0_ref_geo.py | 1 - .../versions/795f6ea8ec45_cor_linear_area.py | 7 +-- .../7d6e98441e4c_ref_geo_inpn_grids_5.py | 1 - .../99591aa2dcf8_add_missing_size_hierachy.py | 13 ++--- .../versions/bc2fcc772b46_geom_4326.py | 37 +++++---------- .../cb038e76d59c_fix_functions_local_srid.py | 19 +++----- .../d02f4563bebe_ref_geo_french_regions.py | 25 ++++------ .../versions/dea1645de8c0_ref_geo_point.py | 6 +-- ...a_add_indexes_on_fk_referencing_id_area.py | 1 - .../e58071a29130_add_missing_size_hierachy.py | 13 ++--- .../ede150d9afd9_ref_geo_inpn_grids_10.py | 1 - ...70b8fcfa_add_areas_types_size_hierarchy.py | 19 +++----- .../versions/f7374cd6e38d_ref_geo_linear.py | 6 +-- .../fda887e7b578_correct_area_name_for_COM.py | 13 ++--- src/ref_geo/routes.py | 1 - src/ref_geo/tests/test_ref_geo.py | 1 - 32 files changed, 100 insertions(+), 233 deletions(-) diff --git a/setup.py b/setup.py index b07915e..6ebbdec 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ import setuptools from pathlib import Path - root_dir = Path(__file__).absolute().parent with (root_dir / "VERSION").open() as f: version = f.read() diff --git a/src/ref_geo/__init__.py b/src/ref_geo/__init__.py index 047811d..5ae86e4 100644 --- a/src/ref_geo/__init__.py +++ b/src/ref_geo/__init__.py @@ -12,7 +12,6 @@ from ref_geo.env import db from ref_geo.routes import routes - migrate = Migrate() diff --git a/src/ref_geo/env.py b/src/ref_geo/env.py index 4818622..4f8493a 100644 --- a/src/ref_geo/env.py +++ b/src/ref_geo/env.py @@ -4,7 +4,6 @@ from flask_sqlalchemy import SQLAlchemy from flask_marshmallow import Marshmallow - db_path = environ.get("FLASK_SQLALCHEMY_DB") if db_path and db_path != f"{__name__}.db": db_module_name, db_object_name = db_path.rsplit(".", 1) diff --git a/src/ref_geo/migrations/utils.py b/src/ref_geo/migrations/utils.py index 9df8739..bdbb164 100644 --- a/src/ref_geo/migrations/utils.py +++ b/src/ref_geo/migrations/utils.py @@ -10,43 +10,33 @@ from utils_flask_sqla.migrations.utils import logger - schema = "ref_geo" def geom_4326_exists(): - return ( - op.get_bind() - .execute( - """ + return op.get_bind().execute(""" SELECT EXISTS ( SELECT 1 FROM information_schema.COLUMNS WHERE table_schema = 'ref_geo' AND table_name='l_areas' AND column_name = 'geom_4326' ) - """ - ) - .scalar() - ) + """).scalar() def delete_area_with_type(area_type): """ Supprimer les zones d’un type donnée, e.g. 'DEP', 'COM', … """ - op.execute( - f""" + op.execute(f""" DELETE FROM {schema}.l_areas la USING {schema}.get_id_area_type('{area_type}') as area_type WHERE la.id_type = area_type - """ - ) + """) def create_temporary_grids_table(schema, temp_table_name): logger.info("Create temporary grids table…") - op.execute( - f""" + op.execute(f""" CREATE TABLE {schema}.{temp_table_name} ( gid integer NOT NULL, cd_sig character varying(21), @@ -54,22 +44,18 @@ def create_temporary_grids_table(schema, temp_table_name): geom public.geometry(MultiPolygon,2154), geojson character varying ) - """ - ) - op.execute( - f""" + """) + op.execute(f""" ALTER TABLE ONLY {schema}.{temp_table_name} ADD CONSTRAINT {temp_table_name}_pkey PRIMARY KEY (gid) - """ - ) + """) def insert_grids_and_drop_temporary_table(schema, temp_table_name, area_type): logger.info("Copy grids in l_areas…") if geom_4326_exists(): # We insert geom and geom_4326 to avoid double conversion like 2154 → 3312 → 4326 - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas (id_type, area_code, area_name, geom, geom_4326) SELECT {schema}.get_id_area_type('{area_type}') AS id_type, @@ -78,11 +64,9 @@ def insert_grids_and_drop_temporary_table(schema, temp_table_name, area_type): ST_Transform(geom, Find_SRID('{schema}', 'l_areas', 'geom')), ST_SetSRID(ST_GeomFromGeoJSON(geojson), 4326) FROM {schema}.{temp_table_name} - """ - ) + """) else: # legacy column geojson_4326 - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas (id_type, area_code, area_name, geom, geojson_4326) SELECT {schema}.get_id_area_type('{area_type}') AS id_type, @@ -91,11 +75,9 @@ def insert_grids_and_drop_temporary_table(schema, temp_table_name, area_type): ST_Transform(geom, Find_SRID('{schema}', 'l_areas', 'geom')), geojson FROM {schema}.{temp_table_name} - """ - ) + """) logger.info("Copy grids in li_grids…") - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.li_grids(id_grid, id_area, cxmin, cxmax, cymin, cymax) SELECT l.area_code, @@ -106,8 +88,7 @@ def insert_grids_and_drop_temporary_table(schema, temp_table_name, area_type): ST_YMax(g.geom) FROM {schema}.{temp_table_name} g JOIN {schema}.l_areas l ON l.area_code = cd_sig; - """ - ) + """) logger.info("Re-indexing…") op.execute(f"REINDEX INDEX {schema}.index_l_areas_geom") logger.info("Dropping temporary grids table…") diff --git a/src/ref_geo/migrations/versions/05a0ae652c13_ref_geo_french_regions_1970.py b/src/ref_geo/migrations/versions/05a0ae652c13_ref_geo_french_regions_1970.py index 8dd5791..362a8c5 100644 --- a/src/ref_geo/migrations/versions/05a0ae652c13_ref_geo_french_regions_1970.py +++ b/src/ref_geo/migrations/versions/05a0ae652c13_ref_geo_french_regions_1970.py @@ -16,7 +16,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "05a0ae652c13" down_revision = None diff --git a/src/ref_geo/migrations/versions/0dfdbfbccd63_ref_geo_french_municipalities.py b/src/ref_geo/migrations/versions/0dfdbfbccd63_ref_geo_french_municipalities.py index 40c4706..d9cef60 100644 --- a/src/ref_geo/migrations/versions/0dfdbfbccd63_ref_geo_french_municipalities.py +++ b/src/ref_geo/migrations/versions/0dfdbfbccd63_ref_geo_french_municipalities.py @@ -15,7 +15,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "0dfdbfbccd63" down_revision = None @@ -29,8 +28,7 @@ def upgrade(): logger.info("Create temporary municipalities table…") - op.execute( - f""" + op.execute(f""" CREATE TABLE {schema}.{temp_table_name} ( gid integer NOT NULL, id character varying(24), @@ -48,22 +46,18 @@ def upgrade(): geom public.geometry(MultiPolygon,2154), geojson character varying ) - """ - ) - op.execute( - f""" + """) + op.execute(f""" ALTER TABLE ONLY {schema}.{temp_table_name} ADD CONSTRAINT {temp_table_name}_pkey PRIMARY KEY (gid) - """ - ) + """) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: logger.info("Inserting municipalities data in temporary table…") cursor.copy_expert(f"COPY {schema}.{temp_table_name} FROM STDIN", geofile) logger.info("Copy municipalities in l_areas…") if geom_4326_exists(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas ( id_type, area_code, @@ -78,11 +72,9 @@ def upgrade(): ST_TRANSFORM(geom, Find_SRID('{schema}', 'l_areas', 'geom')), ST_SetSRID(ST_GeomFromGeoJSON(geojson), 4326) FROM {schema}.{temp_table_name} - """ - ) + """) else: - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas ( id_type, area_code, @@ -97,18 +89,15 @@ def upgrade(): ST_TRANSFORM(geom, Find_SRID('{schema}', 'l_areas', 'geom')), geojson FROM {schema}.{temp_table_name} - """ - ) + """) logger.info("Copy municipalities in li_municipalities…") - op.execute( - f""" + op.execute(f""" INSERT INTO ref_geo.li_municipalities (id_municipality, id_area, status, insee_com, nom_com, insee_arr, insee_dep, insee_reg, code_epci) SELECT id, a.id_area, statut, insee_com, nom_com, insee_arr, insee_dep, insee_reg, code_epci FROM ref_geo.temp_fr_municipalities t JOIN ref_geo.l_areas a ON a.area_code = t.insee_com - """ - ) + """) logger.info("Re-indexing…") op.execute(f"REINDEX INDEX {schema}.index_l_areas_geom") logger.info("Dropping temporary municipalities table…") diff --git a/src/ref_geo/migrations/versions/10a587fb63d1_ref_geo_inpn_grids_20.py b/src/ref_geo/migrations/versions/10a587fb63d1_ref_geo_inpn_grids_20.py index 520c9b5..d7c3df0 100644 --- a/src/ref_geo/migrations/versions/10a587fb63d1_ref_geo_inpn_grids_20.py +++ b/src/ref_geo/migrations/versions/10a587fb63d1_ref_geo_inpn_grids_20.py @@ -15,7 +15,6 @@ insert_grids_and_drop_temporary_table, ) - # revision identifiers, used by Alembic. revision = "10a587fb63d1" down_revision = None @@ -30,8 +29,7 @@ def upgrade(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.bib_areas_types (type_name, type_code, type_desc, @@ -40,8 +38,7 @@ def upgrade(): num_version) VALUES ('Mailles {grid}*{grid}', 'M{grid}', 'Type maille INPN {grid}*{grid}km', NULL, NULL, NULL) ON CONFLICT (type_code) DO NOTHING; - """ - ) + """) create_temporary_grids_table(schema, temp_table_name) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: diff --git a/src/ref_geo/migrations/versions/175cdb17343f_ref_geo_inpn_grids_2.py b/src/ref_geo/migrations/versions/175cdb17343f_ref_geo_inpn_grids_2.py index 505fc97..e46dee1 100644 --- a/src/ref_geo/migrations/versions/175cdb17343f_ref_geo_inpn_grids_2.py +++ b/src/ref_geo/migrations/versions/175cdb17343f_ref_geo_inpn_grids_2.py @@ -29,8 +29,7 @@ def upgrade(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.bib_areas_types (type_name, type_code, type_desc, @@ -39,8 +38,7 @@ def upgrade(): num_version) VALUES ('Mailles {grid}*{grid}', 'M{grid}', 'Type maille INPN {grid}*{grid}km', NULL, NULL, NULL) ON CONFLICT (type_code) DO NOTHING; - """ - ) + """) create_temporary_grids_table(schema, temp_table_name) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: diff --git a/src/ref_geo/migrations/versions/1fdac7036dd9_rewrite_fct_get_altitude_intersection.py b/src/ref_geo/migrations/versions/1fdac7036dd9_rewrite_fct_get_altitude_intersection.py index ba1c853..decec7b 100644 --- a/src/ref_geo/migrations/versions/1fdac7036dd9_rewrite_fct_get_altitude_intersection.py +++ b/src/ref_geo/migrations/versions/1fdac7036dd9_rewrite_fct_get_altitude_intersection.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "1fdac7036dd9" down_revision = "f22d70b8fcfa" @@ -18,8 +17,7 @@ def upgrade(): - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_get_altitude_intersection( mygeom geometry ) @@ -75,13 +73,11 @@ def upgrade(): END; $BODY$; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_get_altitude_intersection( mygeom geometry ) @@ -131,5 +127,4 @@ def downgrade(): END; $BODY$; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/31ca7fd0d2ea_added_l_areas_description.py b/src/ref_geo/migrations/versions/31ca7fd0d2ea_added_l_areas_description.py index 8044632..2232066 100644 --- a/src/ref_geo/migrations/versions/31ca7fd0d2ea_added_l_areas_description.py +++ b/src/ref_geo/migrations/versions/31ca7fd0d2ea_added_l_areas_description.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "1ca7fd0d2ea" down_revision = "1fdac7036dd9" diff --git a/src/ref_geo/migrations/versions/3fdaa1805575_ref_geo_french_departments.py b/src/ref_geo/migrations/versions/3fdaa1805575_ref_geo_french_departments.py index c228571..15a9e07 100644 --- a/src/ref_geo/migrations/versions/3fdaa1805575_ref_geo_french_departments.py +++ b/src/ref_geo/migrations/versions/3fdaa1805575_ref_geo_french_departments.py @@ -11,7 +11,6 @@ from ref_geo.migrations.utils import schema, delete_area_with_type, geom_4326_exists from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "3fdaa1805575" down_revision = None @@ -25,8 +24,7 @@ def upgrade(): logger.info("Create temporary departments table…") - op.execute( - f""" + op.execute(f""" CREATE TABLE {schema}.{temp_table_name} ( gid integer NOT NULL, id character varying(24), @@ -38,22 +36,18 @@ def upgrade(): geom public.geometry(MultiPolygon,2154), geojson character varying ) - """ - ) - op.execute( - f""" + """) + op.execute(f""" ALTER TABLE ONLY {schema}.{temp_table_name} ADD CONSTRAINT {temp_table_name}_pkey PRIMARY KEY (gid) - """ - ) + """) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: logger.info("Inserting departments data in temporary table…") cursor.copy_expert(f"COPY {schema}.{temp_table_name} FROM STDIN", geofile) logger.info("Copy departments data in l_areas…") if geom_4326_exists(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas (id_type, area_code, area_name, geom, geom_4326) SELECT {schema}.get_id_area_type('DEP') AS id_type, @@ -62,11 +56,9 @@ def upgrade(): ST_TRANSFORM(geom, Find_SRID('{schema}', 'l_areas', 'geom')), ST_SetSRID(ST_GeomFromGeoJSON(geojson), 4326) FROM {schema}.{temp_table_name} - """ - ) + """) else: - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas (id_type, area_code, area_name, geom, geojson_4326) SELECT {schema}.get_id_area_type('DEP') AS id_type, @@ -75,8 +67,7 @@ def upgrade(): ST_TRANSFORM(geom, Find_SRID('{schema}', 'l_areas', 'geom')), geojson FROM {schema}.{temp_table_name} - """ - ) + """) logger.info("Re-indexing…") op.execute(f"REINDEX INDEX {schema}.index_l_areas_geom") logger.info("Dropping temporary departments table…") diff --git a/src/ref_geo/migrations/versions/4882d6141a41_add_regions_in_area_types.py b/src/ref_geo/migrations/versions/4882d6141a41_add_regions_in_area_types.py index 89095db..5e32c7e 100644 --- a/src/ref_geo/migrations/versions/4882d6141a41_add_regions_in_area_types.py +++ b/src/ref_geo/migrations/versions/4882d6141a41_add_regions_in_area_types.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "4882d6141a41" down_revision = "e0ac4c9f5c0a" diff --git a/src/ref_geo/migrations/versions/4d0c35ea0cfe_ref_geo_inpn_grids_50.py b/src/ref_geo/migrations/versions/4d0c35ea0cfe_ref_geo_inpn_grids_50.py index 0fc05e7..17a41d9 100644 --- a/src/ref_geo/migrations/versions/4d0c35ea0cfe_ref_geo_inpn_grids_50.py +++ b/src/ref_geo/migrations/versions/4d0c35ea0cfe_ref_geo_inpn_grids_50.py @@ -15,7 +15,6 @@ insert_grids_and_drop_temporary_table, ) - # revision identifiers, used by Alembic. revision = "4d0c35ea0cfe" down_revision = None @@ -30,8 +29,7 @@ def upgrade(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.bib_areas_types (type_name, type_code, type_desc, @@ -40,8 +38,7 @@ def upgrade(): num_version) VALUES ('Mailles {grid}*{grid}', 'M{grid}', 'Type maille INPN {grid}*{grid}km', NULL, NULL, NULL) ON CONFLICT (type_code) DO NOTHING; - """ - ) + """) create_temporary_grids_table(schema, temp_table_name) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: diff --git a/src/ref_geo/migrations/versions/557aadcf2e45_add_missing_size_hierachy.py b/src/ref_geo/migrations/versions/557aadcf2e45_add_missing_size_hierachy.py index 2700658..2c60ee3 100644 --- a/src/ref_geo/migrations/versions/557aadcf2e45_add_missing_size_hierachy.py +++ b/src/ref_geo/migrations/versions/557aadcf2e45_add_missing_size_hierachy.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "557aadcf2e45" down_revision = "175cdb17343f" @@ -18,20 +17,16 @@ def upgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = 2000 where type_code = 'M2'; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = NULL where type_code = 'M2'; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/586613e2faeb_ref_geo_inpn_grids_1.py b/src/ref_geo/migrations/versions/586613e2faeb_ref_geo_inpn_grids_1.py index 123c215..724de31 100644 --- a/src/ref_geo/migrations/versions/586613e2faeb_ref_geo_inpn_grids_1.py +++ b/src/ref_geo/migrations/versions/586613e2faeb_ref_geo_inpn_grids_1.py @@ -16,7 +16,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "586613e2faeb" down_revision = None diff --git a/src/ref_geo/migrations/versions/681306b27407_fix_altitude_trigger.py b/src/ref_geo/migrations/versions/681306b27407_fix_altitude_trigger.py index 6b3a6de..d26f9d0 100644 --- a/src/ref_geo/migrations/versions/681306b27407_fix_altitude_trigger.py +++ b/src/ref_geo/migrations/versions/681306b27407_fix_altitude_trigger.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "681306b27407" down_revision = "4882d6141a41" @@ -18,8 +17,7 @@ def upgrade(): - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_trg_calculate_alt_minmax() RETURNS trigger LANGUAGE plpgsql @@ -52,13 +50,11 @@ def upgrade(): END; $function$ ; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_trg_calculate_alt_minmax() RETURNS trigger LANGUAGE plpgsql @@ -89,5 +85,4 @@ def downgrade(): END; $function$ ; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/6afe74833ed0_ref_geo.py b/src/ref_geo/migrations/versions/6afe74833ed0_ref_geo.py index 85e5fb0..af7f88f 100644 --- a/src/ref_geo/migrations/versions/6afe74833ed0_ref_geo.py +++ b/src/ref_geo/migrations/versions/6afe74833ed0_ref_geo.py @@ -11,7 +11,6 @@ import sqlalchemy as sa from sqlalchemy.sql import text - # revision identifiers, used by Alembic. revision = "6afe74833ed0" down_revision = None diff --git a/src/ref_geo/migrations/versions/795f6ea8ec45_cor_linear_area.py b/src/ref_geo/migrations/versions/795f6ea8ec45_cor_linear_area.py index fadae4e..60a7057 100644 --- a/src/ref_geo/migrations/versions/795f6ea8ec45_cor_linear_area.py +++ b/src/ref_geo/migrations/versions/795f6ea8ec45_cor_linear_area.py @@ -12,7 +12,6 @@ from alembic import op from sqlalchemy.sql import text - # revision identifiers, used by Alembic. revision = "795f6ea8ec45" down_revision = "dea1645de8c0" @@ -26,11 +25,9 @@ def upgrade(): def downgrade(): - op.get_bind().execute( - """ + op.get_bind().execute(""" DROP TABLE ref_geo.cor_linear_area; DROP TABLE ref_geo.cor_areas; - """ - ) + """) pass diff --git a/src/ref_geo/migrations/versions/7d6e98441e4c_ref_geo_inpn_grids_5.py b/src/ref_geo/migrations/versions/7d6e98441e4c_ref_geo_inpn_grids_5.py index 54bf7eb..b215893 100644 --- a/src/ref_geo/migrations/versions/7d6e98441e4c_ref_geo_inpn_grids_5.py +++ b/src/ref_geo/migrations/versions/7d6e98441e4c_ref_geo_inpn_grids_5.py @@ -16,7 +16,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "7d6e98441e4c" down_revision = None diff --git a/src/ref_geo/migrations/versions/99591aa2dcf8_add_missing_size_hierachy.py b/src/ref_geo/migrations/versions/99591aa2dcf8_add_missing_size_hierachy.py index f310a1b..c65df5a 100644 --- a/src/ref_geo/migrations/versions/99591aa2dcf8_add_missing_size_hierachy.py +++ b/src/ref_geo/migrations/versions/99591aa2dcf8_add_missing_size_hierachy.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "99591aa2dcf8" down_revision = "10a587fb63d1" @@ -18,20 +17,16 @@ def upgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = 20000 where type_code = 'M20'; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = NULL where type_code = 'M20'; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/bc2fcc772b46_geom_4326.py b/src/ref_geo/migrations/versions/bc2fcc772b46_geom_4326.py index f003403..afbfb51 100644 --- a/src/ref_geo/migrations/versions/bc2fcc772b46_geom_4326.py +++ b/src/ref_geo/migrations/versions/bc2fcc772b46_geom_4326.py @@ -10,7 +10,6 @@ import sqlalchemy as sa from geoalchemy2 import Geometry - # revision identifiers, used by Alembic. revision = "bc2fcc772b46" down_revision = "795f6ea8ec45" @@ -31,8 +30,7 @@ def upgrade(): table_name="l_areas", column=sa.Column("geom_4326", Geometry("MULTIPOLYGON", 4326)), ) - op.execute( - """ + op.execute(""" CREATE FUNCTION ref_geo.fct_tri_transform_geom() RETURNS trigger AS $BODY$ @@ -85,21 +83,17 @@ def upgrade(): $BODY$ LANGUAGE plpgsql VOLATILE COST 100; - """ - ) + """) # Set geom_4326 before creating trigger! - op.execute( - """ + op.execute(""" UPDATE ref_geo.l_areas SET geom_4326 = ST_Transform(geom, 4326) WHERE geom IS NOT NULL; - """ - ) - op.execute( - """ + """) + op.execute(""" CREATE TRIGGER tri_transform_geom_insert BEFORE INSERT ON ref_geo.l_areas @@ -114,8 +108,7 @@ def upgrade(): ROW EXECUTE FUNCTION ref_geo.fct_tri_transform_geom(); - """ - ) + """) def downgrade(): @@ -124,14 +117,12 @@ def downgrade(): table_name="l_areas", column=sa.Column("geojson_4326", sa.String), ) - op.execute( - """ + op.execute(""" UPDATE ref_geo.l_areas SET geojson_4326 = ST_AsGeoJson(geom_4326) - """ - ) + """) op.execute("DROP TRIGGER tri_transform_geom_insert ON ref_geo.l_areas") op.execute("DROP TRIGGER tri_transform_geom_update ON ref_geo.l_areas") op.execute("DROP FUNCTION ref_geo.fct_tri_transform_geom()") @@ -140,8 +131,7 @@ def downgrade(): table_name="l_areas", column_name="geom_4326", ) - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_tri_calculate_geojson() RETURNS trigger AS $BODY$ @@ -152,13 +142,10 @@ def downgrade(): $BODY$ LANGUAGE plpgsql VOLATILE COST 100; - """ - ) - op.execute( - """ + """) + op.execute(""" CREATE TRIGGER tri_calculate_geojson BEFORE INSERT OR UPDATE OF geom ON ref_geo.l_areas FOR EACH ROW EXECUTE PROCEDURE ref_geo.fct_tri_calculate_geojson(); - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/cb038e76d59c_fix_functions_local_srid.py b/src/ref_geo/migrations/versions/cb038e76d59c_fix_functions_local_srid.py index 928f9b3..9da6ae2 100644 --- a/src/ref_geo/migrations/versions/cb038e76d59c_fix_functions_local_srid.py +++ b/src/ref_geo/migrations/versions/cb038e76d59c_fix_functions_local_srid.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "cb038e76d59c" down_revision = "681306b27407" @@ -18,8 +17,7 @@ def upgrade(): - op.execute( - """ + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_trg_calculate_geom_local() RETURNS trigger AS -- trigger qui reprojete une geom a partir d'une geom source fournie et l'insert dans le NEW @@ -48,10 +46,8 @@ def upgrade(): $BODY$ LANGUAGE plpgsql VOLATILE COST 100; - """ - ) - op.execute( - """ + """) + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_get_altitude_intersection(IN mygeom public.geometry) RETURNS TABLE(altitude_min integer, altitude_max integer) AS $BODY$ @@ -91,10 +87,8 @@ def upgrade(): LANGUAGE plpgsql VOLATILE COST 100 ROWS 1000; - """ - ) - op.execute( - """ + """) + op.execute(""" CREATE OR REPLACE FUNCTION ref_geo.fct_get_area_intersection( IN mygeom public.geometry, IN myidtype integer DEFAULT NULL::integer) @@ -118,8 +112,7 @@ def upgrade(): LANGUAGE plpgsql VOLATILE COST 100 ROWS 1000; - """ - ) + """) def downgrade(): diff --git a/src/ref_geo/migrations/versions/d02f4563bebe_ref_geo_french_regions.py b/src/ref_geo/migrations/versions/d02f4563bebe_ref_geo_french_regions.py index 294b26e..a5a9e0d 100644 --- a/src/ref_geo/migrations/versions/d02f4563bebe_ref_geo_french_regions.py +++ b/src/ref_geo/migrations/versions/d02f4563bebe_ref_geo_french_regions.py @@ -16,7 +16,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "d02f4563bebe" down_revision = None @@ -31,8 +30,7 @@ def upgrade(): logger.info("Create temporary regions table…") - op.execute( - f""" + op.execute(f""" CREATE TABLE {schema}.{temp_table_name} ( gid integer NOT NULL, id character varying(24), @@ -41,22 +39,18 @@ def upgrade(): insee_reg character varying(5), geom public.geometry(MultiPolygon,2154) ) - """ - ) - op.execute( - f""" + """) + op.execute(f""" ALTER TABLE ONLY {schema}.{temp_table_name} ADD CONSTRAINT {temp_table_name}_pkey PRIMARY KEY (gid) - """ - ) + """) cursor = op.get_bind().connection.cursor() with open_remote_file(base_url, filename) as geofile: logger.info("Inserting regions data in temporary table…") cursor.copy_expert(f"COPY {schema}.{temp_table_name} FROM STDIN", geofile) logger.info("Copy regions in l_areas…") if geom_4326_exists(): - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas ( id_type, area_code, @@ -71,11 +65,9 @@ def upgrade(): ST_Transform(geom, Find_SRID('{schema}', 'l_areas', 'geom')), ST_SetSRID(ST_Transform(geom, 4326), 4326) FROM {schema}.{temp_table_name} - """ - ) + """) else: - op.execute( - f""" + op.execute(f""" INSERT INTO {schema}.l_areas ( id_type, area_code, @@ -90,8 +82,7 @@ def upgrade(): ST_Transform(geom, Find_SRID('{schema}', 'l_areas', 'geom')), ST_Transform(geom, 4326) FROM {schema}.{temp_table_name} - """ - ) + """) logger.info("Re-indexing…") op.execute(f"REINDEX INDEX {schema}.index_l_areas_geom") logger.info("Dropping temporary regions table…") diff --git a/src/ref_geo/migrations/versions/dea1645de8c0_ref_geo_point.py b/src/ref_geo/migrations/versions/dea1645de8c0_ref_geo_point.py index 6d30919..3827275 100644 --- a/src/ref_geo/migrations/versions/dea1645de8c0_ref_geo_point.py +++ b/src/ref_geo/migrations/versions/dea1645de8c0_ref_geo_point.py @@ -30,10 +30,8 @@ def upgrade(): def downgrade(): - op.get_bind().execute( - """ + op.get_bind().execute(""" DROP TABLE ref_geo.l_points; DROP TABLE ref_geo.bib_points_types; - """ - ) + """) pass diff --git a/src/ref_geo/migrations/versions/e0ac4c9f5c0a_add_indexes_on_fk_referencing_id_area.py b/src/ref_geo/migrations/versions/e0ac4c9f5c0a_add_indexes_on_fk_referencing_id_area.py index 1f31bbe..1d8df5f 100644 --- a/src/ref_geo/migrations/versions/e0ac4c9f5c0a_add_indexes_on_fk_referencing_id_area.py +++ b/src/ref_geo/migrations/versions/e0ac4c9f5c0a_add_indexes_on_fk_referencing_id_area.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "e0ac4c9f5c0a" down_revision = "6afe74833ed0" diff --git a/src/ref_geo/migrations/versions/e58071a29130_add_missing_size_hierachy.py b/src/ref_geo/migrations/versions/e58071a29130_add_missing_size_hierachy.py index 5790579..391d9ad 100644 --- a/src/ref_geo/migrations/versions/e58071a29130_add_missing_size_hierachy.py +++ b/src/ref_geo/migrations/versions/e58071a29130_add_missing_size_hierachy.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "e58071a29130" down_revision = "4d0c35ea0cfe" @@ -18,20 +17,16 @@ def upgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = 50000 where type_code = 'M50'; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" update ref_geo.bib_areas_types set size_hierarchy = NULL where type_code = 'M50'; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/ede150d9afd9_ref_geo_inpn_grids_10.py b/src/ref_geo/migrations/versions/ede150d9afd9_ref_geo_inpn_grids_10.py index 5a73615..87d3116 100644 --- a/src/ref_geo/migrations/versions/ede150d9afd9_ref_geo_inpn_grids_10.py +++ b/src/ref_geo/migrations/versions/ede150d9afd9_ref_geo_inpn_grids_10.py @@ -16,7 +16,6 @@ ) from utils_flask_sqla.migrations.utils import logger, open_remote_file - # revision identifiers, used by Alembic. revision = "ede150d9afd9" down_revision = None diff --git a/src/ref_geo/migrations/versions/f22d70b8fcfa_add_areas_types_size_hierarchy.py b/src/ref_geo/migrations/versions/f22d70b8fcfa_add_areas_types_size_hierarchy.py index 668624e..4fcecba 100644 --- a/src/ref_geo/migrations/versions/f22d70b8fcfa_add_areas_types_size_hierarchy.py +++ b/src/ref_geo/migrations/versions/f22d70b8fcfa_add_areas_types_size_hierarchy.py @@ -9,7 +9,6 @@ from alembic import op import sqlalchemy as sa - # revision identifiers, used by Alembic. revision = "f22d70b8fcfa" down_revision = "bc2fcc772b46" @@ -18,32 +17,26 @@ def upgrade(): - op.execute( - """ + op.execute(""" ALTER TABLE ref_geo.bib_areas_types ADD COLUMN size_hierarchy INT default NULL; COMMENT ON COLUMN ref_geo.bib_areas_types.size_hierarchy IS 'Diamètre moyen en mètres de ce type zone. Permet d''établir une hiérarchie des types ' 'de zone géographique. Utile pour le floutage des observations.' ; - """ - ) + """) - op.execute( - """ + op.execute(""" UPDATE ref_geo.bib_areas_types SET size_hierarchy = 200000 WHERE type_code = 'REG' ; UPDATE ref_geo.bib_areas_types SET size_hierarchy = 75000 WHERE type_code = 'DEP' ; UPDATE ref_geo.bib_areas_types SET size_hierarchy = 5000 WHERE type_code = 'COM' ; UPDATE ref_geo.bib_areas_types SET size_hierarchy = 10000 WHERE type_code = 'M10' ; UPDATE ref_geo.bib_areas_types SET size_hierarchy = 5000 WHERE type_code = 'M5' ; UPDATE ref_geo.bib_areas_types SET size_hierarchy = 1000 WHERE type_code = 'M1' ; - """ - ) + """) def downgrade(): - op.execute( - """ + op.execute(""" ALTER TABLE ref_geo.bib_areas_types DROP COLUMN size_hierarchy; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/f7374cd6e38d_ref_geo_linear.py b/src/ref_geo/migrations/versions/f7374cd6e38d_ref_geo_linear.py index 5e8048a..fedf941 100644 --- a/src/ref_geo/migrations/versions/f7374cd6e38d_ref_geo_linear.py +++ b/src/ref_geo/migrations/versions/f7374cd6e38d_ref_geo_linear.py @@ -27,11 +27,9 @@ def upgrade(): def downgrade(): - op.execute( - """ + op.execute(""" DROP TABLE ref_geo.cor_linear_group; DROP TABLE ref_geo.t_linear_groups; DROP TABLE ref_geo.l_linears; DROP TABLE ref_geo.bib_linears_types; - """ - ) + """) diff --git a/src/ref_geo/migrations/versions/fda887e7b578_correct_area_name_for_COM.py b/src/ref_geo/migrations/versions/fda887e7b578_correct_area_name_for_COM.py index 7515d35..c74a6bc 100644 --- a/src/ref_geo/migrations/versions/fda887e7b578_correct_area_name_for_COM.py +++ b/src/ref_geo/migrations/versions/fda887e7b578_correct_area_name_for_COM.py @@ -9,7 +9,6 @@ from alembic import op from utils_flask_sqla.migrations.utils import logger - # revision identifiers, used by Alembic. revision = "fda887e7b578" down_revision = "0dfdbfbccd63" @@ -19,26 +18,22 @@ def upgrade(): logger.info("Correct area_name for communes (for characters Œ and œ)") - op.execute( - f""" + op.execute(f""" update ref_geo.l_areas set area_name = replace(area_name, '¼', 'Œ') where area_name like '%¼%'; update ref_geo.l_areas set area_name = replace(area_name, '½', 'œ') where area_name like '%½%'; -""" - ) +""") def downgrade(): - op.execute( - f""" + op.execute(f""" update ref_geo.l_areas set area_name = replace(area_name, 'Œ', '¼') where area_name like '%Œ%'; update ref_geo.l_areas set area_name = replace(area_name, 'œ', '½') where area_name like '%œ%'; -""" - ) +""") diff --git a/src/ref_geo/routes.py b/src/ref_geo/routes.py index 78a8622..1e166bb 100644 --- a/src/ref_geo/routes.py +++ b/src/ref_geo/routes.py @@ -13,7 +13,6 @@ from ref_geo.models import BibAreasTypes, LiMunicipalities, LAreas from ref_geo.schemas import AreaTypeSchema, MunicipalitySchema, AreaSchema - routes = Blueprint("ref_geo", __name__) diff --git a/src/ref_geo/tests/test_ref_geo.py b/src/ref_geo/tests/test_ref_geo.py index 862115e..7868509 100644 --- a/src/ref_geo/tests/test_ref_geo.py +++ b/src/ref_geo/tests/test_ref_geo.py @@ -13,7 +13,6 @@ from ref_geo.models import BibAreasTypes, LAreas from sqlalchemy import select, update - polygon = { "type": "Polygon", "coordinates": [ From 9a198fe99b37164d56a6a2e29b89ad214177d834 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Wed, 28 Jan 2026 16:13:45 +0100 Subject: [PATCH 2/4] add lint commit to ignore blame file --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6a77c6b..3eed0d0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1 +1,3 @@ cdb53135fe1296f55fc02cef26b9660a29595f50 +# black 26 +6bde6e3be9950a783535448c8b4d463aa0726302 From ae25e0a86074cb49be2903fa7003225766e34b99 Mon Sep 17 00:00:00 2001 From: Jacques Fize <4259846+jacquesfize@users.noreply.github.com> Date: Wed, 28 Jan 2026 16:30:44 +0100 Subject: [PATCH 3/4] bump utils flask geo (#44) --- dependencies/Utils-Flask-SQLAlchemy-Geo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/Utils-Flask-SQLAlchemy-Geo b/dependencies/Utils-Flask-SQLAlchemy-Geo index 79e6cd1..3908499 160000 --- a/dependencies/Utils-Flask-SQLAlchemy-Geo +++ b/dependencies/Utils-Flask-SQLAlchemy-Geo @@ -1 +1 @@ -Subproject commit 79e6cd12b0bfffdeb90cf4051c800aa8534b6bb8 +Subproject commit 39084995b67df93951e4c393b7c9c1fd70e0b0d7 From 8437e76b9c160c6e43157342b2981bc67fab9399 Mon Sep 17 00:00:00 2001 From: Pierre-Narcisi Date: Wed, 18 Feb 2026 16:13:00 +0100 Subject: [PATCH 4/4] bump dependencies and modify changelog --- CHANGELOG.md | 7 ++++++- VERSION | 2 +- dependencies/Utils-Flask-SQLAlchemy | 2 +- dependencies/Utils-Flask-SQLAlchemy-Geo | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c927208..370ed08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,17 @@ # CHANGELOG +## 1.5.7 (2026-02-18) + +**🚀 Nouveautés** + +- Mise à jour des dépendances + ## 1.5.6 (2025-09-25) **🐛 Corrections** - Correction du build du package Python à l'origine de l'échec des tests sur GeoNature (par @jacquesfize) - ## 1.5.5 (2025-05-21) **🚀 Nouveautés** diff --git a/VERSION b/VERSION index eac1e0a..f01291b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.6 +1.5.7 diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy index 849db48..06d6ccf 160000 --- a/dependencies/Utils-Flask-SQLAlchemy +++ b/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 849db48ba757540ec8f3881d99bc92c41149e86e +Subproject commit 06d6ccf2cc8851331b3aa6223ef225cc5354f153 diff --git a/dependencies/Utils-Flask-SQLAlchemy-Geo b/dependencies/Utils-Flask-SQLAlchemy-Geo index 3908499..724b013 160000 --- a/dependencies/Utils-Flask-SQLAlchemy-Geo +++ b/dependencies/Utils-Flask-SQLAlchemy-Geo @@ -1 +1 @@ -Subproject commit 39084995b67df93951e4c393b7c9c1fd70e0b0d7 +Subproject commit 724b01335f6b40320f14f64e59bc06dc871d41ef