Skip to content

Commit 5378e63

Browse files
committed
Merge branch 'develop'
2 parents 985a744 + d8c6204 commit 5378e63

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

backend/geonature/core/imports/routes/imports.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,19 +587,17 @@ def get_import_invalid_rows_as_csv(scope, imprt):
587587

588588
filename = imprt.full_file_name.rsplit(".", 1)[0] # remove extension
589589
filename = f"{filename}_errors.csv"
590-
sourcefile = TextIOWrapper(BytesIO(imprt.source_file), encoding=imprt.encoding)
591-
erroneous_row = imprt.erroneous_rows
592590

593591
@stream_with_context
594592
def generate_invalid_rows_csv():
595-
593+
sourcefile = TextIOWrapper(BytesIO(imprt.source_file), encoding=imprt.encoding)
596594
destfile = StringIO()
597595
csvreader = csv.reader(sourcefile, delimiter=imprt.separator)
598596
csvwriter = csv.writer(destfile, dialect=csvreader.dialect, lineterminator="\n")
599597
line_no = 1
600598
for row in csvreader:
601599
# line_no == 1 → csv header
602-
if line_no == 1 or line_no in erroneous_row:
600+
if line_no == 1 or line_no in imprt.erroneous_rows:
603601
csvwriter.writerow(row)
604602
destfile.seek(0)
605603
yield destfile.read().encode(imprt.encoding)

backend/requirements-common.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ celery[redis]
33
chardet # imports
44
click>=7.0
55
fiona>=1.9.6
6-
flask>=3.0
6+
flask<=3.1.1
77
flask-admin
88
flask-babel
99
flask-cors

backend/requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ backports-entry-points-selectable==1.3.0
5757
# pypn-ref-geo
5858
# pypnnomenclature
5959
# taxhub
60-
bcrypt==4.3.0
60+
bcrypt==5.0.0
6161
# via pypnusershub
6262
billiard==4.2.2
6363
# via celery
@@ -122,7 +122,7 @@ fiona==1.10.1
122122
# via
123123
# -r requirements-common.in
124124
# utils-flask-sqlalchemy-geo
125-
flask==3.1.2
125+
flask==3.1.1
126126
# via
127127
# -r requirements-common.in
128128
# flask-admin
@@ -335,7 +335,7 @@ pytz==2025.2
335335
# via
336336
# flask-babel
337337
# pandas
338-
pyyaml==6.0.2
338+
pyyaml==6.0.3
339339
# via bokeh
340340
redis==5.2.1
341341
# via kombu

backend/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ backports-entry-points-selectable==1.3.0
2727
# pypn-ref-geo
2828
# pypnnomenclature
2929
# taxhub
30-
bcrypt==4.3.0
30+
bcrypt==5.0.0
3131
# via pypnusershub
3232
billiard==4.2.2
3333
# via celery
@@ -85,7 +85,7 @@ fiona==1.10.1
8585
# via
8686
# -r requirements-common.in
8787
# utils-flask-sqlalchemy-geo
88-
flask==3.1.2
88+
flask==3.1.1
8989
# via
9090
# -r requirements-common.in
9191
# flask-admin
@@ -286,7 +286,7 @@ pytz==2025.2
286286
# via
287287
# flask-babel
288288
# pandas
289-
pyyaml==6.0.2
289+
pyyaml==6.0.3
290290
# via bokeh
291291
redis==5.2.1
292292
# via kombu

0 commit comments

Comments
 (0)