From dada808ba8dc9ef528258c96889e0006d3dea92c Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Fri, 26 Jan 2024 11:47:33 +0100 Subject: [PATCH 1/5] fix lint --- .../core/gn_commons/medias/routes.py | 1 + .../gn_commons/models/additional_fields.py | 1 + .../geonature/core/gn_commons/models/base.py | 1 + .../geonature/core/gn_meta/mtd/mtd_utils.py | 8 +++--- backend/geonature/core/gn_meta/routes.py | 25 ++++++++++--------- .../core/gn_permissions/decorators.py | 1 + .../geonature/core/gn_permissions/models.py | 1 + .../core/gn_synthese/utils/process.py | 1 + .../gn_synthese/utils/query_select_sqla.py | 1 + .../geonature/core/notifications/models.py | 1 + .../core/users/register_post_actions.py | 1 + ...91edb6796_improve_v_synthese_for_export.py | 1 + ...d_permissions_inherited_modules_objects.py | 1 + ...7f10bbb4f3b_add_mobile_app_settings_url.py | 1 + ...add_table_gn_synthese_bib_reports_types.py | 1 + ...09a637f06b96_default_notification_rules.py | 1 + ...e32a010ea_lstrip_static_media_from_path.py | 1 + ...cf31a75d_insert_ign_250m_bd_alti_in_dem.py | 1 + .../1dbc45309d6e_merge_sensitivity.py | 1 + ..._add_default_value_in_additionalfields_.py | 1 + ...synthese_get_default_nomenclature_value.py | 1 + .../2aa558b1be3a_add_schema_gn_profiles.py | 1 + .../2d7edda45dd4_sensitivity_fk_on_delete.py | 1 + ...ae582_remove_gn_export_t_config_exports.py | 1 + ...add_notification_schema_tables_and_data.py | 1 + .../3d0bf4ee67d1_geonature_samples.py | 1 + ...0535a20e_add_t_modules_ng_module_column.py | 1 + ...add_id_module_to_v_synthese_for_web_app.py | 1 + ...d996dd_additional_fields_remove_columns.py | 1 + ...8df71cb_fix_update_synthese_sensitivity.py | 1 + ...06f5_set_not_null_on_synthese_id_source.py | 1 + ..._add_sensitivity_filter_export_synthese.py | 1 + .../5d65f9c93a32_fix_permissions_view.py | 1 + ...44_delete_cascade_cor_dataset_territory.py | 1 + ..._set_constraint_check_cor_af_territory_.py | 1 + ...1e46813d621_update_synthese_sensitivity.py | 1 + ...te_view_v_synthese_validation_forwebapp.py | 1 + .../7077aa76da3d_bump_dependencies.py | 1 + ..._change_index_vm_valid_profiles_cd_ref_.py | 1 + ...add_altitude_calculation_in_t_base_site.py | 1 + ...2_additional_fields_add_datalist_widget.py | 1 + ...f86_insert_inpn_sensitivity_referential.py | 1 + ...b0e4729_multiple_filters_per_permission.py | 1 + .../8279ce74006b_set_default_modules_type.py | 1 + ...76daa52_add_table_gn_synthese_t_reports.py | 1 + .../87651375c2e8_vectorize_ign_bd_alti.py | 1 + ..._on_id_area_for_table_cor_area_synthese.py | 1 + ...d90ab5e686d_default_profiles_parameters.py | 1 + .../95acee9f0452_add_comment_notification.py | 1 + .../9e9218653d6c_add_synthese_log_history.py | 1 + .../versions/ac08dcf3f27b_diffusion_level.py | 1 + ...df2ee7f4f_auto_update_cor_area_synthese.py | 1 + .../ca052245c6ec_remove_local_srid.py | 1 + ..._remove_v_synthese_decode_nomenclatures.py | 1 + ...cec41a6d3a15_revome_v_roles_permissions.py | 1 + ...fdbde77_correction_sql_on_delete_module.py | 1 + ...5fb13c8_remove_cor_sensitivity_synthese.py | 1 + ...de31e76ce45_remove_old_profile_function.py | 1 + ...5a5099e084_add_additional_fields_object.py | 1 + .../dfec5f64ac73_fix_sensitivity_algo.py | 1 + .../e2a94808cf76_add_notifications_object.py | 1 + .../f051b88a57fd_permissions_available.py | 1 + .../migrations/versions/f06cc80cc8ba_2_7_5.py | 1 + .../f1dd984bff97_add_sensitivity_filter.py | 1 + ...f4ffdc68072c_add_id_module_in_t_sources.py | 1 + backend/geonature/utils/command.py | 1 + backend/geonature/utils/utilsgeometrytools.py | 1 + .../21f661247023_insert_occhab_sample_data.py | 1 + .../2984569d5df6_create_occhab_schema.py | 1 + .../85efc9bb5a47_declare_permissions.py | 1 + .../9a4b4b6f8fe6_add_fct_auto_validation.py | 1 + .../df93a68242ee_declare_permissions.py | 1 + contrib/occtax/backend/occtax/blueprint.py | 8 +++--- ...29_add_id_module_in_pr_occtax_t_releves.py | 1 + ...776a962_t_releves_triggers_optimization.py | 1 + ..._add_cd_hab_in_fct_tri_synthese_update_.py | 1 + ...22c2851bc387_add_database_default_value.py | 1 + .../29c199e07eaa_create_occtax_schema.py | 1 + .../2a0ab7644e1c_occtax_sample_test.py | 1 + .../494cb2245a43_trigger_comportement.py | 1 + ...2d1a_add_missing_id_module_in_t_sources.py | 1 + ...b012_default_value_for_id_nomenclature_.py | 1 + .../61802a0f83b8_fix_occtax_triggers.py | 1 + ...05981de5e_occtax_samples_with_id_module.py | 1 + ...update_synthese_data_bug_occtax_trigger.py | 1 + ...48fea40_restore_occtax_missing_counting.py | 1 + .../9668b861bdb6_remove_v_releve_occtax.py | 1 + .../addb71d8efad_create_occtax_export_view.py | 1 + .../c26c770b00ae_fix_occtax_trigger.py | 1 + .../cce08a64eb4f_insert_occtax_sample_data.py | 1 + .../df088920b2f3_set_not_null_on_id_module.py | 1 + .../e170d1902137_declare_permissions.py | 1 + ...07d2d0ad_get_default_nomenclature_value.py | 1 + data/scripts/import_ginco/import_ca.py | 1 + data/scripts/import_ginco/import_mtd.py | 1 + data/scripts/import_mtd/import_jdd_and_ca.py | 1 + data/scripts/import_mtd/run_import_mtd.py | 1 + 97 files changed, 117 insertions(+), 18 deletions(-) diff --git a/backend/geonature/core/gn_commons/medias/routes.py b/backend/geonature/core/gn_commons/medias/routes.py index 87c1e8fea4..5eec8d6599 100644 --- a/backend/geonature/core/gn_commons/medias/routes.py +++ b/backend/geonature/core/gn_commons/medias/routes.py @@ -2,6 +2,7 @@ Route permettant de manipuler les fichiers contenus dans gn_media """ + from flask import request, redirect, jsonify from werkzeug.exceptions import NotFound diff --git a/backend/geonature/core/gn_commons/models/additional_fields.py b/backend/geonature/core/gn_commons/models/additional_fields.py index faf429a364..0c0bb12349 100644 --- a/backend/geonature/core/gn_commons/models/additional_fields.py +++ b/backend/geonature/core/gn_commons/models/additional_fields.py @@ -1,6 +1,7 @@ """ Modèles du schéma gn_commons """ + from sqlalchemy.dialects.postgresql import JSONB from utils_flask_sqla.serializers import serializable diff --git a/backend/geonature/core/gn_commons/models/base.py b/backend/geonature/core/gn_commons/models/base.py index 13deb8ca9b..1cccb24ced 100644 --- a/backend/geonature/core/gn_commons/models/base.py +++ b/backend/geonature/core/gn_commons/models/base.py @@ -1,6 +1,7 @@ """ Modèles du schéma gn_commons """ + import os from pathlib import Path from collections import defaultdict diff --git a/backend/geonature/core/gn_meta/mtd/mtd_utils.py b/backend/geonature/core/gn_meta/mtd/mtd_utils.py index cacb629032..d1b0666376 100644 --- a/backend/geonature/core/gn_meta/mtd/mtd_utils.py +++ b/backend/geonature/core/gn_meta/mtd/mtd_utils.py @@ -57,9 +57,11 @@ def sync_ds(ds, cd_nomenclatures): ds["id_acquisition_framework"] = af.id_acquisition_framework ds = { - k: func.ref_nomenclatures.get_id_nomenclature(NOMENCLATURE_MAPPING[k], v) - if k.startswith("id_nomenclature") - else v + k: ( + func.ref_nomenclatures.get_id_nomenclature(NOMENCLATURE_MAPPING[k], v) + if k.startswith("id_nomenclature") + else v + ) for k, v in ds.items() if v is not None } diff --git a/backend/geonature/core/gn_meta/routes.py b/backend/geonature/core/gn_meta/routes.py index 43d39e1841..75a99c633d 100644 --- a/backend/geonature/core/gn_meta/routes.py +++ b/backend/geonature/core/gn_meta/routes.py @@ -1,6 +1,7 @@ """ Routes for gn_meta """ + import datetime as dt import json import logging @@ -679,20 +680,20 @@ def get_export_pdf_acquisition_frameworks(id_acquisition_framework): acquisition_framework["chart"] = request.json["chart"] if acquisition_framework: - acquisition_framework[ - "nomenclature_territorial_level" - ] = af.nomenclature_territorial_level.as_dict() - acquisition_framework[ - "nomenclature_financing_type" - ] = af.nomenclature_financing_type.as_dict() + acquisition_framework["nomenclature_territorial_level"] = ( + af.nomenclature_territorial_level.as_dict() + ) + acquisition_framework["nomenclature_financing_type"] = ( + af.nomenclature_financing_type.as_dict() + ) if acquisition_framework["acquisition_framework_start_date"]: - acquisition_framework[ - "acquisition_framework_start_date" - ] = af.acquisition_framework_start_date.strftime("%d/%m/%Y") + acquisition_framework["acquisition_framework_start_date"] = ( + af.acquisition_framework_start_date.strftime("%d/%m/%Y") + ) if acquisition_framework["acquisition_framework_end_date"]: - acquisition_framework[ - "acquisition_framework_end_date" - ] = af.acquisition_framework_end_date.strftime("%d/%m/%Y") + acquisition_framework["acquisition_framework_end_date"] = ( + af.acquisition_framework_end_date.strftime("%d/%m/%Y") + ) acquisition_framework["css"] = { "logo": "Logo_pdf.png", "bandeau": "Bandeau_pdf.png", diff --git a/backend/geonature/core/gn_permissions/decorators.py b/backend/geonature/core/gn_permissions/decorators.py index 1717c70781..74cf621984 100644 --- a/backend/geonature/core/gn_permissions/decorators.py +++ b/backend/geonature/core/gn_permissions/decorators.py @@ -1,6 +1,7 @@ """ Decorators to protects routes with permissions """ + from functools import wraps from warnings import warn diff --git a/backend/geonature/core/gn_permissions/models.py b/backend/geonature/core/gn_permissions/models.py index 1b206c67f3..cc6d825cd0 100644 --- a/backend/geonature/core/gn_permissions/models.py +++ b/backend/geonature/core/gn_permissions/models.py @@ -1,6 +1,7 @@ """ Models of gn_permissions schema """ + from packaging import version import sqlalchemy as sa diff --git a/backend/geonature/core/gn_synthese/utils/process.py b/backend/geonature/core/gn_synthese/utils/process.py index 249d941ce1..9b43344952 100644 --- a/backend/geonature/core/gn_synthese/utils/process.py +++ b/backend/geonature/core/gn_synthese/utils/process.py @@ -1,6 +1,7 @@ """ functions to insert update or delete data in table gn_synthese.synthese """ + from sqlalchemy.exc import IntegrityError, ProgrammingError from geonature.utils.env import DB from geonature.utils.errors import GeonatureApiError diff --git a/backend/geonature/core/gn_synthese/utils/query_select_sqla.py b/backend/geonature/core/gn_synthese/utils/query_select_sqla.py index 955a462a38..7ecf1f5267 100644 --- a/backend/geonature/core/gn_synthese/utils/query_select_sqla.py +++ b/backend/geonature/core/gn_synthese/utils/query_select_sqla.py @@ -5,6 +5,7 @@ https://docs.sqlalchemy.org/en/latest/core/tutorial.html#selecting much more efficient """ + import datetime import unicodedata import uuid diff --git a/backend/geonature/core/notifications/models.py b/backend/geonature/core/notifications/models.py index 38def23450..c41fdf846b 100644 --- a/backend/geonature/core/notifications/models.py +++ b/backend/geonature/core/notifications/models.py @@ -1,6 +1,7 @@ """ Models of gn_notifications schema """ + import datetime import sqlalchemy as sa diff --git a/backend/geonature/core/users/register_post_actions.py b/backend/geonature/core/users/register_post_actions.py index 7c4a027274..707e54ba6a 100644 --- a/backend/geonature/core/users/register_post_actions.py +++ b/backend/geonature/core/users/register_post_actions.py @@ -1,6 +1,7 @@ """ Action triggered after register action (create temp user, change password etc...) """ + import datetime from warnings import warn diff --git a/backend/geonature/migrations/versions/05a91edb6796_improve_v_synthese_for_export.py b/backend/geonature/migrations/versions/05a91edb6796_improve_v_synthese_for_export.py index a663096827..5f1cbbb474 100644 --- a/backend/geonature/migrations/versions/05a91edb6796_improve_v_synthese_for_export.py +++ b/backend/geonature/migrations/versions/05a91edb6796_improve_v_synthese_for_export.py @@ -5,6 +5,7 @@ Create Date: 2023-02-21 17:17:03.016130 """ + from alembic import op diff --git a/backend/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py b/backend/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py index e5e4217824..0e06027980 100644 --- a/backend/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py +++ b/backend/geonature/migrations/versions/0630b93bcfe0_add_permissions_inherited_modules_objects.py @@ -9,6 +9,7 @@ Create Date: 2023-04-13 14:24:21.124669 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/07f10bbb4f3b_add_mobile_app_settings_url.py b/backend/geonature/migrations/versions/07f10bbb4f3b_add_mobile_app_settings_url.py index aafa0661ff..1d07f83fff 100644 --- a/backend/geonature/migrations/versions/07f10bbb4f3b_add_mobile_app_settings_url.py +++ b/backend/geonature/migrations/versions/07f10bbb4f3b_add_mobile_app_settings_url.py @@ -5,6 +5,7 @@ Create Date: 2022-07-13 12:34:42.450453 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/095da7bc6667_add_table_gn_synthese_bib_reports_types.py b/backend/geonature/migrations/versions/095da7bc6667_add_table_gn_synthese_bib_reports_types.py index 032b55611b..bbc21b2943 100644 --- a/backend/geonature/migrations/versions/095da7bc6667_add_table_gn_synthese_bib_reports_types.py +++ b/backend/geonature/migrations/versions/095da7bc6667_add_table_gn_synthese_bib_reports_types.py @@ -5,6 +5,7 @@ Create Date: 2022-03-17 10:57:34.730596 """ + from alembic import op import sqlalchemy as sa from utils_flask_sqla.migrations.utils import logger diff --git a/backend/geonature/migrations/versions/09a637f06b96_default_notification_rules.py b/backend/geonature/migrations/versions/09a637f06b96_default_notification_rules.py index 3dda111a23..a3d62589ec 100644 --- a/backend/geonature/migrations/versions/09a637f06b96_default_notification_rules.py +++ b/backend/geonature/migrations/versions/09a637f06b96_default_notification_rules.py @@ -5,6 +5,7 @@ Create Date: 2023-01-13 09:55:53.525869 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/0cae32a010ea_lstrip_static_media_from_path.py b/backend/geonature/migrations/versions/0cae32a010ea_lstrip_static_media_from_path.py index 594218885b..345539415f 100644 --- a/backend/geonature/migrations/versions/0cae32a010ea_lstrip_static_media_from_path.py +++ b/backend/geonature/migrations/versions/0cae32a010ea_lstrip_static_media_from_path.py @@ -5,6 +5,7 @@ Create Date: 2023-01-25 18:01:06.482391 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/1715cf31a75d_insert_ign_250m_bd_alti_in_dem.py b/backend/geonature/migrations/versions/1715cf31a75d_insert_ign_250m_bd_alti_in_dem.py index 0417e9957c..8060398604 100644 --- a/backend/geonature/migrations/versions/1715cf31a75d_insert_ign_250m_bd_alti_in_dem.py +++ b/backend/geonature/migrations/versions/1715cf31a75d_insert_ign_250m_bd_alti_in_dem.py @@ -4,6 +4,7 @@ Create Date: 2021-09-27 22:58:27.235271 """ + import os.path from zipfile import ZipFile from urllib.parse import urlsplit diff --git a/backend/geonature/migrations/versions/1dbc45309d6e_merge_sensitivity.py b/backend/geonature/migrations/versions/1dbc45309d6e_merge_sensitivity.py index 9fd0f0687b..6ead776d97 100644 --- a/backend/geonature/migrations/versions/1dbc45309d6e_merge_sensitivity.py +++ b/backend/geonature/migrations/versions/1dbc45309d6e_merge_sensitivity.py @@ -5,6 +5,7 @@ Create Date: 2022-02-15 17:45:54.259412 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/1eb624249f2b_add_default_value_in_additionalfields_.py b/backend/geonature/migrations/versions/1eb624249f2b_add_default_value_in_additionalfields_.py index ee326e1608..2c06f477c2 100644 --- a/backend/geonature/migrations/versions/1eb624249f2b_add_default_value_in_additionalfields_.py +++ b/backend/geonature/migrations/versions/1eb624249f2b_add_default_value_in_additionalfields_.py @@ -5,6 +5,7 @@ Create Date: 2021-10-26 10:28:03.196912 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/2a2e5c519fd1_synthese_get_default_nomenclature_value.py b/backend/geonature/migrations/versions/2a2e5c519fd1_synthese_get_default_nomenclature_value.py index b8d10ef1f2..0c3a17d104 100644 --- a/backend/geonature/migrations/versions/2a2e5c519fd1_synthese_get_default_nomenclature_value.py +++ b/backend/geonature/migrations/versions/2a2e5c519fd1_synthese_get_default_nomenclature_value.py @@ -5,6 +5,7 @@ Create Date: 2021-10-06 15:55:37.365073 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/2aa558b1be3a_add_schema_gn_profiles.py b/backend/geonature/migrations/versions/2aa558b1be3a_add_schema_gn_profiles.py index bd9e23e4c0..7be12572bf 100644 --- a/backend/geonature/migrations/versions/2aa558b1be3a_add_schema_gn_profiles.py +++ b/backend/geonature/migrations/versions/2aa558b1be3a_add_schema_gn_profiles.py @@ -5,6 +5,7 @@ Create Date: 2021-08-24 11:10:08.973033 """ + import importlib.resources from alembic import op diff --git a/backend/geonature/migrations/versions/2d7edda45dd4_sensitivity_fk_on_delete.py b/backend/geonature/migrations/versions/2d7edda45dd4_sensitivity_fk_on_delete.py index f363875f65..387c6e1b17 100644 --- a/backend/geonature/migrations/versions/2d7edda45dd4_sensitivity_fk_on_delete.py +++ b/backend/geonature/migrations/versions/2d7edda45dd4_sensitivity_fk_on_delete.py @@ -5,6 +5,7 @@ Create Date: 2022-11-25 12:58:47.583031 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/30edd97ae582_remove_gn_export_t_config_exports.py b/backend/geonature/migrations/versions/30edd97ae582_remove_gn_export_t_config_exports.py index b6b803feef..bd52a18a9a 100644 --- a/backend/geonature/migrations/versions/30edd97ae582_remove_gn_export_t_config_exports.py +++ b/backend/geonature/migrations/versions/30edd97ae582_remove_gn_export_t_config_exports.py @@ -5,6 +5,7 @@ Create Date: 2022-01-21 10:51:15.288875 """ + from alembic import op import sqlalchemy as sa from sqlalchemy.exc import InternalError diff --git a/backend/geonature/migrations/versions/36d0bd313a47_add_notification_schema_tables_and_data.py b/backend/geonature/migrations/versions/36d0bd313a47_add_notification_schema_tables_and_data.py index f83d0a26d1..e7477f3fd2 100644 --- a/backend/geonature/migrations/versions/36d0bd313a47_add_notification_schema_tables_and_data.py +++ b/backend/geonature/migrations/versions/36d0bd313a47_add_notification_schema_tables_and_data.py @@ -5,6 +5,7 @@ Create Date: 2022-09-22 09:58:19.055808 """ + import datetime from alembic import op from sqlalchemy import Column, ForeignKey, Integer, Unicode, UnicodeText, DateTime diff --git a/backend/geonature/migrations/versions/3d0bf4ee67d1_geonature_samples.py b/backend/geonature/migrations/versions/3d0bf4ee67d1_geonature_samples.py index 1fe2c8d8d8..5dcd53540e 100644 --- a/backend/geonature/migrations/versions/3d0bf4ee67d1_geonature_samples.py +++ b/backend/geonature/migrations/versions/3d0bf4ee67d1_geonature_samples.py @@ -4,6 +4,7 @@ Create Date: 2021-09-27 18:00:45.818766 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/42040535a20e_add_t_modules_ng_module_column.py b/backend/geonature/migrations/versions/42040535a20e_add_t_modules_ng_module_column.py index 9c97a6254e..7b08fd8514 100644 --- a/backend/geonature/migrations/versions/42040535a20e_add_t_modules_ng_module_column.py +++ b/backend/geonature/migrations/versions/42040535a20e_add_t_modules_ng_module_column.py @@ -5,6 +5,7 @@ Create Date: 2022-04-05 16:22:57.078076 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/446e902a14e7_add_id_module_to_v_synthese_for_web_app.py b/backend/geonature/migrations/versions/446e902a14e7_add_id_module_to_v_synthese_for_web_app.py index bbd8250046..7a3d13c6f8 100644 --- a/backend/geonature/migrations/versions/446e902a14e7_add_id_module_to_v_synthese_for_web_app.py +++ b/backend/geonature/migrations/versions/446e902a14e7_add_id_module_to_v_synthese_for_web_app.py @@ -5,6 +5,7 @@ Create Date: 2023-09-25 10:09:39.126531 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/497f52d996dd_additional_fields_remove_columns.py b/backend/geonature/migrations/versions/497f52d996dd_additional_fields_remove_columns.py index 8176b1af89..cc2bc3050d 100644 --- a/backend/geonature/migrations/versions/497f52d996dd_additional_fields_remove_columns.py +++ b/backend/geonature/migrations/versions/497f52d996dd_additional_fields_remove_columns.py @@ -5,6 +5,7 @@ Create Date: 2023-01-04 16:02:45.953579 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/4b5478df71cb_fix_update_synthese_sensitivity.py b/backend/geonature/migrations/versions/4b5478df71cb_fix_update_synthese_sensitivity.py index 82dc028533..083a18f9f3 100644 --- a/backend/geonature/migrations/versions/4b5478df71cb_fix_update_synthese_sensitivity.py +++ b/backend/geonature/migrations/versions/4b5478df71cb_fix_update_synthese_sensitivity.py @@ -5,6 +5,7 @@ Create Date: 2022-09-21 18:11:27.597095 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/4cf3fd5d06f5_set_not_null_on_synthese_id_source.py b/backend/geonature/migrations/versions/4cf3fd5d06f5_set_not_null_on_synthese_id_source.py index 1937d02f22..788344d63b 100644 --- a/backend/geonature/migrations/versions/4cf3fd5d06f5_set_not_null_on_synthese_id_source.py +++ b/backend/geonature/migrations/versions/4cf3fd5d06f5_set_not_null_on_synthese_id_source.py @@ -5,6 +5,7 @@ Create Date: 2022-12-05 14:46:04.206294 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/5a2c9c65129f_add_sensitivity_filter_export_synthese.py b/backend/geonature/migrations/versions/5a2c9c65129f_add_sensitivity_filter_export_synthese.py index 9cdd81ce34..e8ab60fd7a 100644 --- a/backend/geonature/migrations/versions/5a2c9c65129f_add_sensitivity_filter_export_synthese.py +++ b/backend/geonature/migrations/versions/5a2c9c65129f_add_sensitivity_filter_export_synthese.py @@ -5,6 +5,7 @@ Create Date: 2023-08-08 16:23:53.059110 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/5d65f9c93a32_fix_permissions_view.py b/backend/geonature/migrations/versions/5d65f9c93a32_fix_permissions_view.py index 140133a23a..945b9829ef 100644 --- a/backend/geonature/migrations/versions/5d65f9c93a32_fix_permissions_view.py +++ b/backend/geonature/migrations/versions/5d65f9c93a32_fix_permissions_view.py @@ -5,6 +5,7 @@ Create Date: 2023-02-20 17:49:03.156681 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/5f4c4b644844_delete_cascade_cor_dataset_territory.py b/backend/geonature/migrations/versions/5f4c4b644844_delete_cascade_cor_dataset_territory.py index bf4aef696e..7080261825 100644 --- a/backend/geonature/migrations/versions/5f4c4b644844_delete_cascade_cor_dataset_territory.py +++ b/backend/geonature/migrations/versions/5f4c4b644844_delete_cascade_cor_dataset_territory.py @@ -5,6 +5,7 @@ Create Date: 2021-10-07 15:27:06.364487 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/6070edb31013_set_constraint_check_cor_af_territory_.py b/backend/geonature/migrations/versions/6070edb31013_set_constraint_check_cor_af_territory_.py index 3bb1e23360..42ba8c563b 100644 --- a/backend/geonature/migrations/versions/6070edb31013_set_constraint_check_cor_af_territory_.py +++ b/backend/geonature/migrations/versions/6070edb31013_set_constraint_check_cor_af_territory_.py @@ -5,6 +5,7 @@ Create Date: 2022-06-16 15:26:52.658472 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/61e46813d621_update_synthese_sensitivity.py b/backend/geonature/migrations/versions/61e46813d621_update_synthese_sensitivity.py index 324ec41f95..6e389c104c 100644 --- a/backend/geonature/migrations/versions/61e46813d621_update_synthese_sensitivity.py +++ b/backend/geonature/migrations/versions/61e46813d621_update_synthese_sensitivity.py @@ -5,6 +5,7 @@ Create Date: 2022-02-15 15:23:08.732729 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/6f7d5549d49e_delete_view_v_synthese_validation_forwebapp.py b/backend/geonature/migrations/versions/6f7d5549d49e_delete_view_v_synthese_validation_forwebapp.py index 7dc0366b71..193c0857dd 100644 --- a/backend/geonature/migrations/versions/6f7d5549d49e_delete_view_v_synthese_validation_forwebapp.py +++ b/backend/geonature/migrations/versions/6f7d5549d49e_delete_view_v_synthese_validation_forwebapp.py @@ -5,6 +5,7 @@ Create Date: 2022-01-03 15:36:45.053127 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/7077aa76da3d_bump_dependencies.py b/backend/geonature/migrations/versions/7077aa76da3d_bump_dependencies.py index 460c67007d..415cedca9c 100644 --- a/backend/geonature/migrations/versions/7077aa76da3d_bump_dependencies.py +++ b/backend/geonature/migrations/versions/7077aa76da3d_bump_dependencies.py @@ -5,6 +5,7 @@ Create Date: 2021-09-27 22:33:47.462525 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/7471f51011c8_change_index_vm_valid_profiles_cd_ref_.py b/backend/geonature/migrations/versions/7471f51011c8_change_index_vm_valid_profiles_cd_ref_.py index ad3b93de4c..1967880e2f 100644 --- a/backend/geonature/migrations/versions/7471f51011c8_change_index_vm_valid_profiles_cd_ref_.py +++ b/backend/geonature/migrations/versions/7471f51011c8_change_index_vm_valid_profiles_cd_ref_.py @@ -5,6 +5,7 @@ Create Date: 2021-11-08 10:59:23.047142 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/74908bad752e_add_altitude_calculation_in_t_base_site.py b/backend/geonature/migrations/versions/74908bad752e_add_altitude_calculation_in_t_base_site.py index 29644ce91e..5eb593feea 100644 --- a/backend/geonature/migrations/versions/74908bad752e_add_altitude_calculation_in_t_base_site.py +++ b/backend/geonature/migrations/versions/74908bad752e_add_altitude_calculation_in_t_base_site.py @@ -5,6 +5,7 @@ Create Date: 2022-05-19 15:07:04.613778 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/77a3bc6628d2_additional_fields_add_datalist_widget.py b/backend/geonature/migrations/versions/77a3bc6628d2_additional_fields_add_datalist_widget.py index 0dd2d85171..843166f8c4 100644 --- a/backend/geonature/migrations/versions/77a3bc6628d2_additional_fields_add_datalist_widget.py +++ b/backend/geonature/migrations/versions/77a3bc6628d2_additional_fields_add_datalist_widget.py @@ -5,6 +5,7 @@ Create Date: 2022-04-27 17:00:38.070394 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/7dfd0a813f86_insert_inpn_sensitivity_referential.py b/backend/geonature/migrations/versions/7dfd0a813f86_insert_inpn_sensitivity_referential.py index e6b8021c81..ec0d0a300e 100644 --- a/backend/geonature/migrations/versions/7dfd0a813f86_insert_inpn_sensitivity_referential.py +++ b/backend/geonature/migrations/versions/7dfd0a813f86_insert_inpn_sensitivity_referential.py @@ -4,6 +4,7 @@ Create Date: 2021-11-22 """ + import csv import importlib.resources from functools import lru_cache, partial diff --git a/backend/geonature/migrations/versions/7fe46b0e4729_multiple_filters_per_permission.py b/backend/geonature/migrations/versions/7fe46b0e4729_multiple_filters_per_permission.py index 7566a7f027..5c1bd734a2 100644 --- a/backend/geonature/migrations/versions/7fe46b0e4729_multiple_filters_per_permission.py +++ b/backend/geonature/migrations/versions/7fe46b0e4729_multiple_filters_per_permission.py @@ -5,6 +5,7 @@ Create Date: 2023-04-12 14:38:44.788935 """ + from alembic import op import sqlalchemy as sa from sqlalchemy import Column, ForeignKey, Integer, Unicode diff --git a/backend/geonature/migrations/versions/8279ce74006b_set_default_modules_type.py b/backend/geonature/migrations/versions/8279ce74006b_set_default_modules_type.py index ef94f28d0d..45d3fb99bf 100644 --- a/backend/geonature/migrations/versions/8279ce74006b_set_default_modules_type.py +++ b/backend/geonature/migrations/versions/8279ce74006b_set_default_modules_type.py @@ -5,6 +5,7 @@ Create Date: 2023-02-22 12:47:26.727855 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/829a376daa52_add_table_gn_synthese_t_reports.py b/backend/geonature/migrations/versions/829a376daa52_add_table_gn_synthese_t_reports.py index 5392bc5c09..7f16bd9c95 100644 --- a/backend/geonature/migrations/versions/829a376daa52_add_table_gn_synthese_t_reports.py +++ b/backend/geonature/migrations/versions/829a376daa52_add_table_gn_synthese_t_reports.py @@ -5,6 +5,7 @@ Create Date: 2022-03-17 10:57:55.989648 """ + from alembic import op import sqlalchemy as sa from utils_flask_sqla.migrations.utils import logger diff --git a/backend/geonature/migrations/versions/87651375c2e8_vectorize_ign_bd_alti.py b/backend/geonature/migrations/versions/87651375c2e8_vectorize_ign_bd_alti.py index 74338b0cdd..d211d9222f 100644 --- a/backend/geonature/migrations/versions/87651375c2e8_vectorize_ign_bd_alti.py +++ b/backend/geonature/migrations/versions/87651375c2e8_vectorize_ign_bd_alti.py @@ -4,6 +4,7 @@ Create Date: 2021-09-28 10:41:26.441911 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/8888e5cce63b_add_index_on_id_area_for_table_cor_area_synthese.py b/backend/geonature/migrations/versions/8888e5cce63b_add_index_on_id_area_for_table_cor_area_synthese.py index 1ee6ae8028..a5581f4639 100644 --- a/backend/geonature/migrations/versions/8888e5cce63b_add_index_on_id_area_for_table_cor_area_synthese.py +++ b/backend/geonature/migrations/versions/8888e5cce63b_add_index_on_id_area_for_table_cor_area_synthese.py @@ -5,6 +5,7 @@ Create Date: 2023-01-18 17:34:54.298323 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/8d90ab5e686d_default_profiles_parameters.py b/backend/geonature/migrations/versions/8d90ab5e686d_default_profiles_parameters.py index cdf1505ca6..08d7d95153 100644 --- a/backend/geonature/migrations/versions/8d90ab5e686d_default_profiles_parameters.py +++ b/backend/geonature/migrations/versions/8d90ab5e686d_default_profiles_parameters.py @@ -5,6 +5,7 @@ Create Date: 2022-08-10 14:07:35.234716 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/95acee9f0452_add_comment_notification.py b/backend/geonature/migrations/versions/95acee9f0452_add_comment_notification.py index e1ec992dfd..1ceb659b08 100644 --- a/backend/geonature/migrations/versions/95acee9f0452_add_comment_notification.py +++ b/backend/geonature/migrations/versions/95acee9f0452_add_comment_notification.py @@ -5,6 +5,7 @@ Create Date: 2023-04-06 19:02:39.863972 """ + import sqlalchemy as sa from alembic import op diff --git a/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py b/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py index 28fe308da0..ff0d0e8982 100644 --- a/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py +++ b/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py @@ -5,6 +5,7 @@ Create Date: 2022-04-06 15:39:37.428357 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/ac08dcf3f27b_diffusion_level.py b/backend/geonature/migrations/versions/ac08dcf3f27b_diffusion_level.py index 7f1a1de93c..6e76edcd67 100644 --- a/backend/geonature/migrations/versions/ac08dcf3f27b_diffusion_level.py +++ b/backend/geonature/migrations/versions/ac08dcf3f27b_diffusion_level.py @@ -5,6 +5,7 @@ Create Date: 2022-02-10 12:45:05.472204 """ + from distutils.util import strtobool from alembic import op, context diff --git a/backend/geonature/migrations/versions/c0fdf2ee7f4f_auto_update_cor_area_synthese.py b/backend/geonature/migrations/versions/c0fdf2ee7f4f_auto_update_cor_area_synthese.py index d562c20c14..aa5ba1d567 100644 --- a/backend/geonature/migrations/versions/c0fdf2ee7f4f_auto_update_cor_area_synthese.py +++ b/backend/geonature/migrations/versions/c0fdf2ee7f4f_auto_update_cor_area_synthese.py @@ -5,6 +5,7 @@ Create Date: 2021-09-14 17:18:11.606752 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/ca052245c6ec_remove_local_srid.py b/backend/geonature/migrations/versions/ca052245c6ec_remove_local_srid.py index 8444c40b58..be4295009f 100644 --- a/backend/geonature/migrations/versions/ca052245c6ec_remove_local_srid.py +++ b/backend/geonature/migrations/versions/ca052245c6ec_remove_local_srid.py @@ -5,6 +5,7 @@ Create Date: 2022-03-11 15:11:46.640624 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/ca0fe5d21ea2_remove_v_synthese_decode_nomenclatures.py b/backend/geonature/migrations/versions/ca0fe5d21ea2_remove_v_synthese_decode_nomenclatures.py index 4eb20607c3..1cff3c024b 100644 --- a/backend/geonature/migrations/versions/ca0fe5d21ea2_remove_v_synthese_decode_nomenclatures.py +++ b/backend/geonature/migrations/versions/ca0fe5d21ea2_remove_v_synthese_decode_nomenclatures.py @@ -5,6 +5,7 @@ Create Date: 2022-04-04 14:59:57.340518 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/cec41a6d3a15_revome_v_roles_permissions.py b/backend/geonature/migrations/versions/cec41a6d3a15_revome_v_roles_permissions.py index 36c1add90f..caf8c4f6f7 100644 --- a/backend/geonature/migrations/versions/cec41a6d3a15_revome_v_roles_permissions.py +++ b/backend/geonature/migrations/versions/cec41a6d3a15_revome_v_roles_permissions.py @@ -5,6 +5,7 @@ Create Date: 2023-02-23 22:21:30.039893 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/cf1c1fdbde77_correction_sql_on_delete_module.py b/backend/geonature/migrations/versions/cf1c1fdbde77_correction_sql_on_delete_module.py index df8df23c6d..4544a8c4b5 100644 --- a/backend/geonature/migrations/versions/cf1c1fdbde77_correction_sql_on_delete_module.py +++ b/backend/geonature/migrations/versions/cf1c1fdbde77_correction_sql_on_delete_module.py @@ -5,6 +5,7 @@ Create Date: 2023-04-11 11:22:39.603084 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/d80835fb13c8_remove_cor_sensitivity_synthese.py b/backend/geonature/migrations/versions/d80835fb13c8_remove_cor_sensitivity_synthese.py index 2c9620f42a..18b36b21e5 100644 --- a/backend/geonature/migrations/versions/d80835fb13c8_remove_cor_sensitivity_synthese.py +++ b/backend/geonature/migrations/versions/d80835fb13c8_remove_cor_sensitivity_synthese.py @@ -5,6 +5,7 @@ Create Date: 2022-02-15 12:16:38.003591 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/dde31e76ce45_remove_old_profile_function.py b/backend/geonature/migrations/versions/dde31e76ce45_remove_old_profile_function.py index 33402a3881..ed982197b6 100644 --- a/backend/geonature/migrations/versions/dde31e76ce45_remove_old_profile_function.py +++ b/backend/geonature/migrations/versions/dde31e76ce45_remove_old_profile_function.py @@ -5,6 +5,7 @@ Create Date: 2022-01-06 10:23:55.290043 """ + import sqlalchemy as sa from alembic import op diff --git a/backend/geonature/migrations/versions/df5a5099e084_add_additional_fields_object.py b/backend/geonature/migrations/versions/df5a5099e084_add_additional_fields_object.py index 44325b3a2f..de44ff8f9f 100644 --- a/backend/geonature/migrations/versions/df5a5099e084_add_additional_fields_object.py +++ b/backend/geonature/migrations/versions/df5a5099e084_add_additional_fields_object.py @@ -5,6 +5,7 @@ Create Date: 2023-04-20 10:46:00.334251 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/dfec5f64ac73_fix_sensitivity_algo.py b/backend/geonature/migrations/versions/dfec5f64ac73_fix_sensitivity_algo.py index 3527bbc698..58bfe8d036 100644 --- a/backend/geonature/migrations/versions/dfec5f64ac73_fix_sensitivity_algo.py +++ b/backend/geonature/migrations/versions/dfec5f64ac73_fix_sensitivity_algo.py @@ -5,6 +5,7 @@ Create Date: 2022-01-28 14:06:38.748133 """ + from distutils.util import strtobool from alembic import op, context diff --git a/backend/geonature/migrations/versions/e2a94808cf76_add_notifications_object.py b/backend/geonature/migrations/versions/e2a94808cf76_add_notifications_object.py index ed42c1eea4..f4758908cc 100644 --- a/backend/geonature/migrations/versions/e2a94808cf76_add_notifications_object.py +++ b/backend/geonature/migrations/versions/e2a94808cf76_add_notifications_object.py @@ -5,6 +5,7 @@ Create Date: 2023-04-14 18:16:57.981499 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/migrations/versions/f051b88a57fd_permissions_available.py b/backend/geonature/migrations/versions/f051b88a57fd_permissions_available.py index 01a0255c21..d5a3a1e0b8 100644 --- a/backend/geonature/migrations/versions/f051b88a57fd_permissions_available.py +++ b/backend/geonature/migrations/versions/f051b88a57fd_permissions_available.py @@ -5,6 +5,7 @@ Create Date: 2023-04-14 17:19:36.490766 """ + from alembic import op import sqlalchemy as sa from sqlalchemy.types import Integer, Boolean, Unicode diff --git a/backend/geonature/migrations/versions/f06cc80cc8ba_2_7_5.py b/backend/geonature/migrations/versions/f06cc80cc8ba_2_7_5.py index dcc5f6a8af..63ae3d4610 100644 --- a/backend/geonature/migrations/versions/f06cc80cc8ba_2_7_5.py +++ b/backend/geonature/migrations/versions/f06cc80cc8ba_2_7_5.py @@ -4,6 +4,7 @@ Create Date: 2021-08-10 14:23:55.144250 """ + import importlib from alembic import op, context diff --git a/backend/geonature/migrations/versions/f1dd984bff97_add_sensitivity_filter.py b/backend/geonature/migrations/versions/f1dd984bff97_add_sensitivity_filter.py index 34842153c4..767aa10aef 100644 --- a/backend/geonature/migrations/versions/f1dd984bff97_add_sensitivity_filter.py +++ b/backend/geonature/migrations/versions/f1dd984bff97_add_sensitivity_filter.py @@ -5,6 +5,7 @@ Create Date: 2023-04-19 16:24:57.945428 """ + from alembic import op import sqlalchemy as sa from sqlalchemy import Column, Boolean diff --git a/backend/geonature/migrations/versions/f4ffdc68072c_add_id_module_in_t_sources.py b/backend/geonature/migrations/versions/f4ffdc68072c_add_id_module_in_t_sources.py index 7cd05a7d61..cc54ea257a 100644 --- a/backend/geonature/migrations/versions/f4ffdc68072c_add_id_module_in_t_sources.py +++ b/backend/geonature/migrations/versions/f4ffdc68072c_add_id_module_in_t_sources.py @@ -5,6 +5,7 @@ Create Date: 2022-04-27 13:42:51.851067 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/geonature/utils/command.py b/backend/geonature/utils/command.py index 0b1481c36d..d900d2b3d0 100644 --- a/backend/geonature/utils/command.py +++ b/backend/geonature/utils/command.py @@ -6,6 +6,7 @@ fichiers de routing du frontend etc...). Ces dernières doivent pouvoir fonctionner même si un paquet PIP du requirement GeoNature n'a pas été bien installé """ + import os import json from subprocess import run, DEVNULL diff --git a/backend/geonature/utils/utilsgeometrytools.py b/backend/geonature/utils/utilsgeometrytools.py index bd2f21770b..01cb740308 100644 --- a/backend/geonature/utils/utilsgeometrytools.py +++ b/backend/geonature/utils/utilsgeometrytools.py @@ -2,6 +2,7 @@ Fonctions permettant de manipuler de façon génériques les fonctions de flask_sqla_geo """ + from pathlib import Path from flask import current_app diff --git a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/21f661247023_insert_occhab_sample_data.py b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/21f661247023_insert_occhab_sample_data.py index 78f629ced0..a429fbac4d 100644 --- a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/21f661247023_insert_occhab_sample_data.py +++ b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/21f661247023_insert_occhab_sample_data.py @@ -5,6 +5,7 @@ Create Date: 2021-10-04 10:15:40.419932 """ + import importlib from alembic import op diff --git a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/2984569d5df6_create_occhab_schema.py b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/2984569d5df6_create_occhab_schema.py index fe2f86c805..3ca1e5d595 100644 --- a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/2984569d5df6_create_occhab_schema.py +++ b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/2984569d5df6_create_occhab_schema.py @@ -5,6 +5,7 @@ Create Date: 2021-10-04 10:15:40.419932 """ + import importlib from alembic import op diff --git a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/85efc9bb5a47_declare_permissions.py b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/85efc9bb5a47_declare_permissions.py index bb3d430478..e0de408fa2 100644 --- a/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/85efc9bb5a47_declare_permissions.py +++ b/contrib/gn_module_occhab/backend/gn_module_occhab/migrations/85efc9bb5a47_declare_permissions.py @@ -5,6 +5,7 @@ Create Date: 2023-05-17 14:34:51.804258 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/gn_module_validation/backend/gn_module_validation/migrations/9a4b4b6f8fe6_add_fct_auto_validation.py b/contrib/gn_module_validation/backend/gn_module_validation/migrations/9a4b4b6f8fe6_add_fct_auto_validation.py index 76db3b877c..7280c60be0 100644 --- a/contrib/gn_module_validation/backend/gn_module_validation/migrations/9a4b4b6f8fe6_add_fct_auto_validation.py +++ b/contrib/gn_module_validation/backend/gn_module_validation/migrations/9a4b4b6f8fe6_add_fct_auto_validation.py @@ -5,6 +5,7 @@ Create Date: 2023-10-25 17:18:04.438706 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/gn_module_validation/backend/gn_module_validation/migrations/df93a68242ee_declare_permissions.py b/contrib/gn_module_validation/backend/gn_module_validation/migrations/df93a68242ee_declare_permissions.py index 49f837c7b0..e6cdf7e880 100644 --- a/contrib/gn_module_validation/backend/gn_module_validation/migrations/df93a68242ee_declare_permissions.py +++ b/contrib/gn_module_validation/backend/gn_module_validation/migrations/df93a68242ee_declare_permissions.py @@ -5,6 +5,7 @@ Create Date: 2023-05-17 15:15:38.833529 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/blueprint.py b/contrib/occtax/backend/occtax/blueprint.py index c561371834..a10d441fa3 100644 --- a/contrib/occtax/backend/occtax/blueprint.py +++ b/contrib/occtax/backend/occtax/blueprint.py @@ -89,9 +89,11 @@ def getReleves(scope): page = int(parameters.get("offset", 0)) orderby = { "orderby": (parameters.get("orderby", "date_max")).lower(), - "order": (parameters.get("order", "desc")).lower() - if (parameters.get("order", "desc")).lower() == "asc" - else "desc", # asc or desc + "order": ( + (parameters.get("order", "desc")).lower() + if (parameters.get("order", "desc")).lower() == "asc" + else "desc" + ), # asc or desc } # Filters diff --git a/contrib/occtax/backend/occtax/migrations/023b0be41829_add_id_module_in_pr_occtax_t_releves.py b/contrib/occtax/backend/occtax/migrations/023b0be41829_add_id_module_in_pr_occtax_t_releves.py index 17bc61cbb5..5784e63466 100644 --- a/contrib/occtax/backend/occtax/migrations/023b0be41829_add_id_module_in_pr_occtax_t_releves.py +++ b/contrib/occtax/backend/occtax/migrations/023b0be41829_add_id_module_in_pr_occtax_t_releves.py @@ -5,6 +5,7 @@ Create Date: 2022-04-06 16:19:58.971694 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/0ff94776a962_t_releves_triggers_optimization.py b/contrib/occtax/backend/occtax/migrations/0ff94776a962_t_releves_triggers_optimization.py index 9b5425408c..a8cf6e91ca 100644 --- a/contrib/occtax/backend/occtax/migrations/0ff94776a962_t_releves_triggers_optimization.py +++ b/contrib/occtax/backend/occtax/migrations/0ff94776a962_t_releves_triggers_optimization.py @@ -5,6 +5,7 @@ Create Date: 2022-11-14 15:39:49.550279 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/1b4f44762020_add_cd_hab_in_fct_tri_synthese_update_.py b/contrib/occtax/backend/occtax/migrations/1b4f44762020_add_cd_hab_in_fct_tri_synthese_update_.py index ba25430156..60c6cd552d 100644 --- a/contrib/occtax/backend/occtax/migrations/1b4f44762020_add_cd_hab_in_fct_tri_synthese_update_.py +++ b/contrib/occtax/backend/occtax/migrations/1b4f44762020_add_cd_hab_in_fct_tri_synthese_update_.py @@ -5,6 +5,7 @@ Create Date: 2023-04-04 00:26:12.030884 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/22c2851bc387_add_database_default_value.py b/contrib/occtax/backend/occtax/migrations/22c2851bc387_add_database_default_value.py index 5bbc781e0b..1e6fece028 100644 --- a/contrib/occtax/backend/occtax/migrations/22c2851bc387_add_database_default_value.py +++ b/contrib/occtax/backend/occtax/migrations/22c2851bc387_add_database_default_value.py @@ -5,6 +5,7 @@ Create Date: 2022-04-25 13:52:16.016035 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/29c199e07eaa_create_occtax_schema.py b/contrib/occtax/backend/occtax/migrations/29c199e07eaa_create_occtax_schema.py index 209fcdf2d5..2fb7b6c45f 100644 --- a/contrib/occtax/backend/occtax/migrations/29c199e07eaa_create_occtax_schema.py +++ b/contrib/occtax/backend/occtax/migrations/29c199e07eaa_create_occtax_schema.py @@ -5,6 +5,7 @@ Create Date: 2021-10-04 10:15:40.419932 """ + import importlib from alembic import op diff --git a/contrib/occtax/backend/occtax/migrations/2a0ab7644e1c_occtax_sample_test.py b/contrib/occtax/backend/occtax/migrations/2a0ab7644e1c_occtax_sample_test.py index 3f1771a43b..eebaf5f49d 100644 --- a/contrib/occtax/backend/occtax/migrations/2a0ab7644e1c_occtax_sample_test.py +++ b/contrib/occtax/backend/occtax/migrations/2a0ab7644e1c_occtax_sample_test.py @@ -5,6 +5,7 @@ Create Date: 2022-01-18 16:55:20.493967 """ + import importlib from alembic import op diff --git a/contrib/occtax/backend/occtax/migrations/494cb2245a43_trigger_comportement.py b/contrib/occtax/backend/occtax/migrations/494cb2245a43_trigger_comportement.py index 435cfd5fbe..5a8a8244ff 100644 --- a/contrib/occtax/backend/occtax/migrations/494cb2245a43_trigger_comportement.py +++ b/contrib/occtax/backend/occtax/migrations/494cb2245a43_trigger_comportement.py @@ -5,6 +5,7 @@ Create Date: 2021-10-07 16:01:31.763465 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/4c97453a2d1a_add_missing_id_module_in_t_sources.py b/contrib/occtax/backend/occtax/migrations/4c97453a2d1a_add_missing_id_module_in_t_sources.py index 49817f15f3..e3568c29ab 100644 --- a/contrib/occtax/backend/occtax/migrations/4c97453a2d1a_add_missing_id_module_in_t_sources.py +++ b/contrib/occtax/backend/occtax/migrations/4c97453a2d1a_add_missing_id_module_in_t_sources.py @@ -5,6 +5,7 @@ Create Date: 2022-12-14 11:43:46.873045 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/576cbd26b012_default_value_for_id_nomenclature_.py b/contrib/occtax/backend/occtax/migrations/576cbd26b012_default_value_for_id_nomenclature_.py index 348b28f92a..7ae553f427 100644 --- a/contrib/occtax/backend/occtax/migrations/576cbd26b012_default_value_for_id_nomenclature_.py +++ b/contrib/occtax/backend/occtax/migrations/576cbd26b012_default_value_for_id_nomenclature_.py @@ -5,6 +5,7 @@ Create Date: 2022-11-02 10:45:57.851612 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/61802a0f83b8_fix_occtax_triggers.py b/contrib/occtax/backend/occtax/migrations/61802a0f83b8_fix_occtax_triggers.py index c2f493d549..797f822d3c 100644 --- a/contrib/occtax/backend/occtax/migrations/61802a0f83b8_fix_occtax_triggers.py +++ b/contrib/occtax/backend/occtax/migrations/61802a0f83b8_fix_occtax_triggers.py @@ -5,6 +5,7 @@ Create Date: 2022-11-09 15:52:14.071528 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/87705981de5e_occtax_samples_with_id_module.py b/contrib/occtax/backend/occtax/migrations/87705981de5e_occtax_samples_with_id_module.py index 92256c7024..a97d8c4bfa 100644 --- a/contrib/occtax/backend/occtax/migrations/87705981de5e_occtax_samples_with_id_module.py +++ b/contrib/occtax/backend/occtax/migrations/87705981de5e_occtax_samples_with_id_module.py @@ -5,6 +5,7 @@ Create Date: 2023-01-18 10:29:41.071499 """ + import importlib from alembic import op diff --git a/contrib/occtax/backend/occtax/migrations/944072911ff7_update_synthese_data_bug_occtax_trigger.py b/contrib/occtax/backend/occtax/migrations/944072911ff7_update_synthese_data_bug_occtax_trigger.py index 520951c10d..b5d6a0e11f 100644 --- a/contrib/occtax/backend/occtax/migrations/944072911ff7_update_synthese_data_bug_occtax_trigger.py +++ b/contrib/occtax/backend/occtax/migrations/944072911ff7_update_synthese_data_bug_occtax_trigger.py @@ -5,6 +5,7 @@ Create Date: 2021-10-07 16:24:09.029496 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/9624348fea40_restore_occtax_missing_counting.py b/contrib/occtax/backend/occtax/migrations/9624348fea40_restore_occtax_missing_counting.py index e7272a2ef8..d3de1a0eba 100644 --- a/contrib/occtax/backend/occtax/migrations/9624348fea40_restore_occtax_missing_counting.py +++ b/contrib/occtax/backend/occtax/migrations/9624348fea40_restore_occtax_missing_counting.py @@ -5,6 +5,7 @@ Create Date: 2022-10-12 16:19:18.065398 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/9668b861bdb6_remove_v_releve_occtax.py b/contrib/occtax/backend/occtax/migrations/9668b861bdb6_remove_v_releve_occtax.py index bcbe9c6627..651878d003 100644 --- a/contrib/occtax/backend/occtax/migrations/9668b861bdb6_remove_v_releve_occtax.py +++ b/contrib/occtax/backend/occtax/migrations/9668b861bdb6_remove_v_releve_occtax.py @@ -5,6 +5,7 @@ Create Date: 2023-02-08 16:11:52.634937 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/addb71d8efad_create_occtax_export_view.py b/contrib/occtax/backend/occtax/migrations/addb71d8efad_create_occtax_export_view.py index d6d6e2fec0..2ca8fd6798 100644 --- a/contrib/occtax/backend/occtax/migrations/addb71d8efad_create_occtax_export_view.py +++ b/contrib/occtax/backend/occtax/migrations/addb71d8efad_create_occtax_export_view.py @@ -5,6 +5,7 @@ Create Date: 2021-10-04 11:22:19.819944 """ + import importlib from alembic import op diff --git a/contrib/occtax/backend/occtax/migrations/c26c770b00ae_fix_occtax_trigger.py b/contrib/occtax/backend/occtax/migrations/c26c770b00ae_fix_occtax_trigger.py index 0f01919b92..23d29d40a6 100644 --- a/contrib/occtax/backend/occtax/migrations/c26c770b00ae_fix_occtax_trigger.py +++ b/contrib/occtax/backend/occtax/migrations/c26c770b00ae_fix_occtax_trigger.py @@ -5,6 +5,7 @@ Create Date: 2022-10-12 16:05:50.816962 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/cce08a64eb4f_insert_occtax_sample_data.py b/contrib/occtax/backend/occtax/migrations/cce08a64eb4f_insert_occtax_sample_data.py index caa3d6b37d..784836b5d4 100644 --- a/contrib/occtax/backend/occtax/migrations/cce08a64eb4f_insert_occtax_sample_data.py +++ b/contrib/occtax/backend/occtax/migrations/cce08a64eb4f_insert_occtax_sample_data.py @@ -5,6 +5,7 @@ Create Date: 2021-10-04 11:31:50.957854 """ + import importlib from alembic import op diff --git a/contrib/occtax/backend/occtax/migrations/df088920b2f3_set_not_null_on_id_module.py b/contrib/occtax/backend/occtax/migrations/df088920b2f3_set_not_null_on_id_module.py index 05935a38c4..f9c11bccd5 100644 --- a/contrib/occtax/backend/occtax/migrations/df088920b2f3_set_not_null_on_id_module.py +++ b/contrib/occtax/backend/occtax/migrations/df088920b2f3_set_not_null_on_id_module.py @@ -5,6 +5,7 @@ Create Date: 2022-12-05 10:44:39.166886 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/e170d1902137_declare_permissions.py b/contrib/occtax/backend/occtax/migrations/e170d1902137_declare_permissions.py index 2521b0cc0e..d504de7677 100644 --- a/contrib/occtax/backend/occtax/migrations/e170d1902137_declare_permissions.py +++ b/contrib/occtax/backend/occtax/migrations/e170d1902137_declare_permissions.py @@ -5,6 +5,7 @@ Create Date: 2023-05-16 09:55:41.005029 """ + from alembic import op import sqlalchemy as sa diff --git a/contrib/occtax/backend/occtax/migrations/f57107d2d0ad_get_default_nomenclature_value.py b/contrib/occtax/backend/occtax/migrations/f57107d2d0ad_get_default_nomenclature_value.py index af40996a60..4b2b755f00 100644 --- a/contrib/occtax/backend/occtax/migrations/f57107d2d0ad_get_default_nomenclature_value.py +++ b/contrib/occtax/backend/occtax/migrations/f57107d2d0ad_get_default_nomenclature_value.py @@ -5,6 +5,7 @@ Create Date: 2021-10-06 16:36:13.566702 """ + from alembic import op import sqlalchemy as sa diff --git a/data/scripts/import_ginco/import_ca.py b/data/scripts/import_ginco/import_ca.py index 93cc7d40c0..c3c8212139 100644 --- a/data/scripts/import_ginco/import_ca.py +++ b/data/scripts/import_ginco/import_ca.py @@ -2,6 +2,7 @@ Script importing metadata in GeoNature DataBase based on uuid of datasets to import Use the inpn webservice to get corresponding xml files. Works with datasets and acquisition frameworks, not yet with parents acquisition frameworks (to do) """ + import os import datetime import xml.etree.ElementTree as ET diff --git a/data/scripts/import_ginco/import_mtd.py b/data/scripts/import_ginco/import_mtd.py index 2a93c996e8..268033eaed 100644 --- a/data/scripts/import_ginco/import_mtd.py +++ b/data/scripts/import_ginco/import_mtd.py @@ -2,6 +2,7 @@ Script importing metadata in GeoNature DataBase based on uuid of datasets to import Use the inpn webservice to get corresponding xml files. Works with datasets and acquisition frameworks, not yet with parents acquisition frameworks (to do) """ + import os import xml.etree.ElementTree as ET diff --git a/data/scripts/import_mtd/import_jdd_and_ca.py b/data/scripts/import_mtd/import_jdd_and_ca.py index 230836ea97..b177f325b2 100644 --- a/data/scripts/import_mtd/import_jdd_and_ca.py +++ b/data/scripts/import_mtd/import_jdd_and_ca.py @@ -1,6 +1,7 @@ """ Ce script importe les informations des JDD et des CA à partir du webservice MTD. A la difference du script run_import_mtd, il trouve les CA correspondant aux JDD à partir du XML d'un JDD. Il n'est pas necessaire d'avoir une liste de CA """ + import requests import psycopg2 import xml.etree.ElementTree as ET diff --git a/data/scripts/import_mtd/run_import_mtd.py b/data/scripts/import_mtd/run_import_mtd.py index 54d6e28474..f687e60ef9 100644 --- a/data/scripts/import_mtd/run_import_mtd.py +++ b/data/scripts/import_mtd/run_import_mtd.py @@ -2,6 +2,7 @@ Script importing metadata in GeoNature DataBase based on uuid of datasets to import Use the inpn webservice to get corresponding xml files. Works with datasets and acquisition frameworks, not yet with parents acquisition frameworks (to do) """ + import requests import psycopg2 import xml.etree.ElementTree as ET From 261f9e2b633ece836e03481bfcdf3b9b0def55b3 Mon Sep 17 00:00:00 2001 From: Pierre Narcisi Date: Fri, 26 Jan 2024 14:04:25 +0100 Subject: [PATCH 2/5] Bump submodules --- backend/dependencies/Habref-api-module | 2 +- backend/dependencies/Nomenclature-api-module | 2 +- backend/dependencies/RefGeo | 2 +- backend/dependencies/TaxHub | 2 +- backend/dependencies/UsersHub | 2 +- backend/dependencies/UsersHub-authentification-module | 2 +- backend/dependencies/Utils-Flask-SQLAlchemy | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/dependencies/Habref-api-module b/backend/dependencies/Habref-api-module index 8631c4de22..5d7d672a62 160000 --- a/backend/dependencies/Habref-api-module +++ b/backend/dependencies/Habref-api-module @@ -1 +1 @@ -Subproject commit 8631c4de222637847ce4c177cdc123ee6c6e42c3 +Subproject commit 5d7d672a62074046479e552284872d0e94254aab diff --git a/backend/dependencies/Nomenclature-api-module b/backend/dependencies/Nomenclature-api-module index 202a5798ad..96f13df757 160000 --- a/backend/dependencies/Nomenclature-api-module +++ b/backend/dependencies/Nomenclature-api-module @@ -1 +1 @@ -Subproject commit 202a5798ad42a387934db21218767799f156458e +Subproject commit 96f13df7576de0ea7d2cdf21f9c96d408d072037 diff --git a/backend/dependencies/RefGeo b/backend/dependencies/RefGeo index 18f47417a1..f2a42c3545 160000 --- a/backend/dependencies/RefGeo +++ b/backend/dependencies/RefGeo @@ -1 +1 @@ -Subproject commit 18f47417a10d9bc75777d2f348fbd80e94bbbe32 +Subproject commit f2a42c354583405f08cc2ef4b40c661a4c0ac739 diff --git a/backend/dependencies/TaxHub b/backend/dependencies/TaxHub index e19116ed3a..ea591a8cd5 160000 --- a/backend/dependencies/TaxHub +++ b/backend/dependencies/TaxHub @@ -1 +1 @@ -Subproject commit e19116ed3a8a4345c2e1848f17ca55472a4ea24e +Subproject commit ea591a8cd5882ef296966e0e98260e2f248312de diff --git a/backend/dependencies/UsersHub b/backend/dependencies/UsersHub index f2a1d5efff..8b35a30fc0 160000 --- a/backend/dependencies/UsersHub +++ b/backend/dependencies/UsersHub @@ -1 +1 @@ -Subproject commit f2a1d5efff2ce2601b366e7dd7e552074432fe11 +Subproject commit 8b35a30fc00b13a3edf3efecf4292795c290394a diff --git a/backend/dependencies/UsersHub-authentification-module b/backend/dependencies/UsersHub-authentification-module index 4b05b88b73..26302acc4c 160000 --- a/backend/dependencies/UsersHub-authentification-module +++ b/backend/dependencies/UsersHub-authentification-module @@ -1 +1 @@ -Subproject commit 4b05b88b736e2fddc54d74857d81b4e41e76b936 +Subproject commit 26302acc4c275460a0d3cf633b34d3694993b3af diff --git a/backend/dependencies/Utils-Flask-SQLAlchemy b/backend/dependencies/Utils-Flask-SQLAlchemy index 619b3ca706..16fa1c8d89 160000 --- a/backend/dependencies/Utils-Flask-SQLAlchemy +++ b/backend/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 619b3ca70625316137202fd239c8f2a7ccdd5b91 +Subproject commit 16fa1c8d890edf56741a253a1e94eb18aa3f49f1 From 050247dffb7e6c6b69fcf92361d83a08c9382ef6 Mon Sep 17 00:00:00 2001 From: Pierre Narcisi Date: Fri, 26 Jan 2024 14:14:40 +0100 Subject: [PATCH 3/5] Bump Taxhub --- backend/dependencies/TaxHub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/dependencies/TaxHub b/backend/dependencies/TaxHub index ea591a8cd5..d6407bc1b5 160000 --- a/backend/dependencies/TaxHub +++ b/backend/dependencies/TaxHub @@ -1 +1 @@ -Subproject commit ea591a8cd5882ef296966e0e98260e2f248312de +Subproject commit d6407bc1b5e19c36181a4fc70129cb6952ba3d60 From 62231f38e7496a1748233d48399da55f517184fa Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Fri, 26 Jan 2024 15:09:42 +0100 Subject: [PATCH 4/5] force taxonomie migration to setup first --- install/03b_populate_db.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/03b_populate_db.sh b/install/03b_populate_db.sh index 6844c17fdd..c0fc08cd11 100755 --- a/install/03b_populate_db.sh +++ b/install/03b_populate_db.sh @@ -1,5 +1,6 @@ #!/bin/bash geonature db upgrade geonature@head -x local-srid=$srid_local +geonature db upgrade taxonomie@head -x local-srid=$srid_local geonature db autoupgrade -x local-srid=$srid_local geonature db exec "DO 'BEGIN ASSERT EXISTS (SELECT 1 FROM taxonomie.taxref); END'" 2>/dev/null \ @@ -43,11 +44,11 @@ geonature db exec "DO 'BEGIN ASSERT EXISTS (SELECT 1 FROM gn_sensitivity.t_sensi then geonature db upgrade ref_geo_fr_departments@head geonature sensitivity add-referential \ - --source-name "Référentiel sensibilité TAXREF v16 20230203" \ - --url https://geonature.fr/data/inpn/sensitivity/RefSensibiliteV16_20230203.zip \ - --zipfile RefSensibiliteV16_20230203.zip \ - --csvfile RefSensibiliteV16_20230203/RefSensibilite_16.csv \ - --encoding=iso-8859-15 + --source-name "Référentiel sensibilité TAXREF v16 20230203" \ + --url https://geonature.fr/data/inpn/sensitivity/RefSensibiliteV16_20230203.zip \ + --zipfile RefSensibiliteV16_20230203.zip \ + --csvfile RefSensibiliteV16_20230203/RefSensibilite_16.csv \ + --encoding=iso-8859-15 geonature sensitivity refresh-rules-cache fi From 0c12562c5a15cf892b176f2f95c5fc56f5604ca9 Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Fri, 26 Jan 2024 15:39:30 +0100 Subject: [PATCH 5/5] fix migration --- backend/dependencies/Nomenclature-api-module | 2 +- install/03b_populate_db.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/dependencies/Nomenclature-api-module b/backend/dependencies/Nomenclature-api-module index 96f13df757..13be8f7712 160000 --- a/backend/dependencies/Nomenclature-api-module +++ b/backend/dependencies/Nomenclature-api-module @@ -1 +1 @@ -Subproject commit 96f13df7576de0ea7d2cdf21f9c96d408d072037 +Subproject commit 13be8f77125a529c1aea19c67b5d52a9fffbfdff diff --git a/install/03b_populate_db.sh b/install/03b_populate_db.sh index c0fc08cd11..a5bebbc961 100755 --- a/install/03b_populate_db.sh +++ b/install/03b_populate_db.sh @@ -1,6 +1,5 @@ #!/bin/bash geonature db upgrade geonature@head -x local-srid=$srid_local -geonature db upgrade taxonomie@head -x local-srid=$srid_local geonature db autoupgrade -x local-srid=$srid_local geonature db exec "DO 'BEGIN ASSERT EXISTS (SELECT 1 FROM taxonomie.taxref); END'" 2>/dev/null \