Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
update RefGeo to 1.5.3

fix revision

fix rebase develop

fix package lock
  • Loading branch information
jacquesfize authored and bouttier committed Aug 14, 2024
1 parent ba00c44 commit eb43238
Show file tree
Hide file tree
Showing 8 changed files with 5,579 additions and 1,402 deletions.
2 changes: 1 addition & 1 deletion backend/geonature/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,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
Expand Down
2 changes: 2 additions & 0 deletions backend/geonature/tests/imports/test_imports_occhab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
{
Expand Down
5 changes: 2 additions & 3 deletions backend/geonature/utils/celery.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from celery import Celery
import flask
from geonature.utils.env import db


class FlaskCelery(Celery):
Expand Down Expand Up @@ -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
2 changes: 0 additions & 2 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# revision identifiers, used by Alembic.
revision = "295861464d84"
down_revision = "85efc9bb5a47"
down_revision = "fcf1e091b636"
branch_labels = None
depends_on = None

Expand Down
Loading

0 comments on commit eb43238

Please sign in to comment.