From 9f52ed0930c82b4d47a9d3482b86290df6c2d436 Mon Sep 17 00:00:00 2001
From: Lilian Gasser <gasserli@ethz.ch>
Date: Wed, 16 Jan 2019 14:07:40 +0100
Subject: [PATCH] numpy<1.16 such that scikit-image works, fix bugs in
utils_annot
---
requirements.txt | 2 +-
src/python/utils_annot.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index ae3be3df..dec9aa29 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-numpy
+numpy<1.16
scipy
pandas
xlrd
diff --git a/src/python/utils_annot.py b/src/python/utils_annot.py
index e41d934a..e27d825a 100644
--- a/src/python/utils_annot.py
+++ b/src/python/utils_annot.py
@@ -207,7 +207,7 @@ def get_complete_text(textbox):
complete_text += thattext
# in first two textlines of textbox, check for colon
- if ind_tl < 3:
+ if ind_tl < 2:
if ':' in thattext:
ind_tl_colon = ind_tl
@@ -536,7 +536,7 @@ def find_names(term, str_name, str_role, list_uniqueID, df_names, str_canton, bl
'Vizepräsident']
list_notnames = ['Art', 'Rath', 'Alinea', 'Stimmen', 'Stimme', 'Hans', 'Walter', 'Werner', 'projet', 'stimmt', 'nicht', 'vote', 'Gallen', 'StGallen',
- 'Kasse', 'fasse', 'Sitten', 'Herren', 'Herr', 'Alter', 'Biffer', 'biffer', 'Rédiger', 'rédiger', 'Wer', 'Fällen']
+ 'Kasse', 'fasse', 'Sitten', 'Herren', 'Herr', 'Alter', 'Biffer', 'biffer', 'Rédiger', 'rédiger', 'Wer', 'Fällen', 'Ari', 'bietet', 'autre']
list_places = get_list_cantons(df_names)
--
GitLab