fix rebase

update RefGeo to 1.5.3

fix revision

fix rebase develop

fix package lock

backend/geonature/app.py

@@ -128,7 +128,7 @@ def create_app(with_external_mods=True):
     if "CELERY" in app.config:
         from geonature.utils.celery import celery_app
 
-        celery_app.init_app(app)
+        # celery_app.init_app(app)
         celery_app.conf.update(app.config["CELERY"])
 
     # Emails configuration

backend/geonature/tests/imports/test_imports_occhab.py

@@ -173,6 +173,7 @@ def imported_import(client, prepared_import):
     with logged_user(client, imprt.authors[0]):
         r = client.post(url_for("import.import_valid_data", import_id=imprt.id_import))
     assert r.status_code == 200, r.data
+
     db.session.refresh(imprt)
     return imprt
 
@@ -183,6 +184,7 @@ def imported_import(client, prepared_import):
 class TestImportsOcchab:
     @pytest.mark.parametrize("import_file_name", ["valid_file.csv"])
     def test_import_valid_file(self, imported_import):
+
         assert_import_errors(
             imported_import,
             {

backend/geonature/utils/celery.py

@@ -1,6 +1,5 @@
 from celery import Celery
 import flask
-from geonature.utils.env import db
 
 
 class FlaskCelery(Celery):
@@ -33,7 +32,7 @@ def __call__(self, *args, **kwargs):
 
     def init_app(self, app):
         self.app = app
-        self.config_from_object(app.config)
+        self.config_from_object(app.config["CELERY"])
 
 
-celery_app = FlaskCelery("geonature")
+celery_app = Celery("geonature")  # FIX ME

backend/requirements-dev.txt

@@ -62,7 +62,7 @@ bokeh==3.4.1
     # via -r requirements-common.in
 boto3==1.29.1
     # via taxhub
-botocore==1.34.112
+botocore==1.32.7
     # via
     #   boto3
     #   s3transfer
@@ -262,8 +262,6 @@ marshmallow-sqlalchemy==1.0.0
     #   taxhub
     #   usershub
     #   utils-flask-sqlalchemy-geo
-munch==4.0.0
-    # via fiona
 numpy==1.26.2
     # via
     #   bokeh
@@ -274,11 +272,9 @@ packaging==23.2
     # via
     #   -r requirements-common.in
     #   bokeh
-    #   flask-marshmallow
     #   geoalchemy2
     #   gunicorn
     #   marshmallow
-    #   marshmallow-sqlalchemy
 pandas==2.1.4
     # via
     #   -r requirements-common.in
@@ -332,7 +328,7 @@ requests==2.32.2
     # via
     #   pypn-habref-api
     #   pypnusershub
-s3transfer==0.10.1
+s3transfer==0.7.0
     # via boto3
 shapely==2.0.4
     # via
@@ -416,7 +412,9 @@ wtforms-components==0.10.5
 wtforms-sqlalchemy==0.4.1
     # via -r requirements-common.in
 xmltodict==0.13.0
-    # via -r requirements-common.in
+    # via
+    #   -r requirements-common.in
+    #   pypnusershub
 xyzservices==2024.4.0
     # via bokeh
 zipp==3.17.0

backend/requirements.txt

@@ -211,8 +211,6 @@ marshmallow-sqlalchemy==1.0.0
     #   pypnusershub
     #   taxhub
     #   utils-flask-sqlalchemy-geo
-munch==4.0.0
-    # via fiona
 numpy==1.26.3
     # via
     #   bokeh

contrib/gn_module_occhab/backend/gn_module_occhab/migrations/295861464d84_change_export_view.py

@@ -12,7 +12,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "295861464d84"
-down_revision = "85efc9bb5a47"
+down_revision = "fcf1e091b636"
 branch_labels = None
 depends_on = None