followthemoney 3.6.4__py2.py3-none-any.whl → 3.7.0__py2.py3-none-any.whl

followthemoney/__init__.py

@@ -3,7 +3,7 @@ import os
 from followthemoney.model import Model
 from followthemoney.util import set_model_locale
 
-__version__ = "3.6.4"
+__version__ = "3.7.0"
 
 
 model_path = os.path.dirname(__file__)

followthemoney/mapping/entity.py

@@ -20,7 +20,6 @@ log = logging.getLogger(__name__)
 
 
 class EntityMapping(object):
-
     __slots__ = (
         "model",
         "name",
@@ -117,22 +116,30 @@ class EntityMapping(object):
             if prop.prop.type == registry.country:
                 discarded_values = prop.map(proxy, record, entities)
                 for value in discarded_values:
-                    log.warn(f"[{self.name}] Discarded unclean value \"{value}\" for property \"{prop.prop.qname}\".")
+                    log.warning(
+                        f'[{self.name}] Discarded unclean value "{value}" for property "{prop.prop.qname}".'
+                    )
 
         for prop in self.properties:
             if prop.prop.type != registry.country:
                 discarded_values = prop.map(proxy, record, entities)
                 for value in discarded_values:
-                    log.warn(f"[{self.name}] Discarding unclean value \"{value}\" for property \"{prop.prop.qname}\".")
+                    log.warning(
+                        f'[{self.name}] Discarding unclean value "{value}" for property "{prop.prop.qname}".'
+                    )
 
         # Generate the ID at the end to avoid self-reference checks on empty
         # keys.
         proxy.id = self.compute_key(record)
         if proxy.id is None:
             if self.id_column:
-                log.warn(f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in the \"{self.id_column}\" column.")
+                log.warning(
+                    f'[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in the "{self.id_column}" column.'
+                )
             if self.keys:
-                log.warn(f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in key columns.")
+                log.warning(
+                    f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in key columns."
+                )
             return None
 
         for prop in self.properties:
@@ -141,7 +148,9 @@ class EntityMapping(object):
                 # the mapping, not in the model. Basically it means: if
                 # this row of source data doesn't have that field, then do
                 # not map it again.
-                log.warn(f"[{self.name}] Skipping entity because required property \"{prop.prop.name}\" is empty.")
+                log.warning(
+                    f'[{self.name}] Skipping entity because required property "{prop.prop.name}" is empty.'
+                )
                 return None
         return proxy
 

followthemoney/proxy.py

@@ -220,8 +220,8 @@ class EntityProxy(object):
         # Somewhat hacky: limit the maximum size of any particular
         # field to avoid overloading upstream aleph/elasticsearch.
         value_size = len(value)
-        if prop.type.max_size is not None:
-            if self._size + value_size > prop.type.max_size:
+        if prop.type.total_size is not None:
+            if self._size + value_size > prop.type.total_size:
                 # msg = "[%s] too large. Rejecting additional values."
                 # log.warning(msg, prop.name)
                 return None
@@ -309,7 +309,7 @@ class EntityProxy(object):
         if self.schema.source_prop is not None and self.schema.target_prop is not None:
             sources = self.get(self.schema.source_prop)
             targets = self.get(self.schema.target_prop)
-            for (source, target) in product(sources, targets):
+            for source, target in product(sources, targets):
                 yield (source, target)
 
     def get_type_values(
@@ -414,7 +414,7 @@ class EntityProxy(object):
         for a more generous matching approach than the actual country values."""
         countries = set(self.countries)
         if not len(countries):
-            for (prop, value) in self.itervalues():
+            for prop, value in self.itervalues():
                 hint = prop.type.country_hint(value)
                 if hint is not None:
                     countries.add(hint)

followthemoney/schema/BankAccount.yaml

@@ -4,7 +4,7 @@ BankAccount:
   extends:
     - Asset
   description: >
-    An account held at a bank and controlled by an owner. This may also be used 
+    An account held at a bank and controlled by an owner. This may also be used
     to describe more complex arrangements like correspondent bank settlement accounts.
   matchable: true
   featured:

followthemoney/schema/Documentation.yml

@@ -2,9 +2,10 @@ Documentation:
   label: "Documentation"
   plural: "Documentations"
   description: >
-    Links some entity to a document, which might provide further detail or 
+    Links some entity to a document, which might provide further detail or
     evidence regarding the entity.
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - document

followthemoney/schema/Organization.yaml

@@ -5,7 +5,7 @@ Organization:
   plural: Organizations
   description: >
     Any type of incorporated entity that cannot be owned by another (see Company). This
-    might include charities, foundations or state-owned enterprises, depending on their 
+    might include charities, foundations or state-owned enterprises, depending on their
     jurisdiction.
   matchable: true
   featured:

followthemoney/schema/Person.yaml

@@ -90,8 +90,8 @@ Person:
       label: Eye color
     hairColor:
       label: Hair color
-    identifyingMarks:
-      label: Identifying marks
+    appearance:
+      label: Physical appearance
     religion:
       label: Religion
     political:

followthemoney/schema/Position.yaml

@@ -8,7 +8,7 @@ Position:
   description: >
     A post, role or position within an organization or body.
     This describes a position one or more people may occupy
-    and not the occupation of the post by a specific individual at a 
+    and not the occupation of the post by a specific individual at a
     specific point in time.
 
     'subnationalArea' should be used to further restrict the scope of the

followthemoney/schema/Post.yaml

@@ -9,7 +9,7 @@ Post:
   # But they're using it to define the post as an abstract thing, this
   # describes the interval in which it is held by an individual.
   description: >
-    A post, role or position held by an individual within an organization 
+    A post, role or position held by an individual within an organization
     or body. This describes the period for which the position is held,
     not the abstract concept of the post.
   featured:

followthemoney/schema/Project.yaml

@@ -24,4 +24,4 @@ Project:
     phase:
       label: "Phase"
     goal:
-      label: "Project goal"
+      label: "Project goal"

followthemoney/translations/ar/LC_MESSAGES/followthemoney.po

@@ -450,7 +450,7 @@ msgstr "حسابات بنكية"
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 
@@ -1625,7 +1625,7 @@ msgstr "مستندات التوثيق"
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 
@@ -2761,7 +2761,7 @@ msgstr "منظمات"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  jurisdiction.\n"
+"enterprises, depending on their jurisdiction.\n"
 msgstr ""
 
 #. Ownership.label
@@ -3129,7 +3129,7 @@ msgstr ""
 #. Position.description
 #: followthemoney/schema/Position.yaml
 msgid ""
-"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a  specific point in time.\n"
+"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a specific point in time.\n"
 "'subnationalArea' should be used to further restrict the scope of the position. It should not simply represent some regional aspect of the role - e.g. the constituency of a national member of parliament - when their legislative jurisdiction is nationwide.\n"
 msgstr ""
 
@@ -3161,7 +3161,7 @@ msgstr ""
 #. Post.description
 #: followthemoney/schema/Post.yaml
 msgid ""
-"A post, role or position held by an individual within an organization  or "
+"A post, role or position held by an individual within an organization or "
 "body. This describes the period for which the position is held, not the "
 "abstract concept of the post.\n"
 msgstr ""

followthemoney/translations/bs/LC_MESSAGES/followthemoney.po

@@ -440,7 +440,7 @@ msgstr ""
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 
@@ -2416,7 +2416,7 @@ msgstr "Organizacije"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  juristiction.\n"
+"enterprises, depending on their juristiction.\n"
 msgstr ""
 
 #. Ownership.label

followthemoney/translations/de/LC_MESSAGES/followthemoney.po

@@ -453,7 +453,7 @@ msgstr "Bankkonten"
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 
@@ -1623,7 +1623,7 @@ msgstr "Dokumentationen"
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 "Eine Verweis von einem Objekt auf in Dokument, das weitere Details oder "
@@ -2758,7 +2758,7 @@ msgstr "Organisationen"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  jurisdiction.\n"
+"enterprises, depending on their jurisdiction.\n"
 msgstr ""
 
 #. Ownership.label
@@ -3129,7 +3129,7 @@ msgstr ""
 #. Position.description
 #: followthemoney/schema/Position.yaml
 msgid ""
-"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a  specific point in time.\n"
+"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a specific point in time.\n"
 "'subnationalArea' should be used to further restrict the scope of the position. It should not simply represent some regional aspect of the role - e.g. the constituency of a national member of parliament - when their legislative jurisdiction is nationwide.\n"
 msgstr ""
 
@@ -3161,7 +3161,7 @@ msgstr ""
 #. Post.description
 #: followthemoney/schema/Post.yaml
 msgid ""
-"A post, role or position held by an individual within an organization  or "
+"A post, role or position held by an individual within an organization or "
 "body. This describes the period for which the position is held, not the "
 "abstract concept of the post.\n"
 msgstr ""

followthemoney/translations/es/LC_MESSAGES/followthemoney.po

@@ -450,7 +450,7 @@ msgstr "Cuentas bancarias"
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 
@@ -1628,7 +1628,7 @@ msgstr "Documentos"
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 
@@ -2768,7 +2768,7 @@ msgstr "Organizaciones"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  jurisdiction.\n"
+"enterprises, depending on their jurisdiction.\n"
 msgstr ""
 
 #. Ownership.label
@@ -3137,7 +3137,7 @@ msgstr ""
 #. Position.description
 #: followthemoney/schema/Position.yaml
 msgid ""
-"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a  specific point in time.\n"
+"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a specific point in time.\n"
 "'subnationalArea' should be used to further restrict the scope of the position. It should not simply represent some regional aspect of the role - e.g. the constituency of a national member of parliament - when their legislative jurisdiction is nationwide.\n"
 msgstr ""
 
@@ -3169,7 +3169,7 @@ msgstr ""
 #. Post.description
 #: followthemoney/schema/Post.yaml
 msgid ""
-"A post, role or position held by an individual within an organization  or "
+"A post, role or position held by an individual within an organization or "
 "body. This describes the period for which the position is held, not the "
 "abstract concept of the post.\n"
 msgstr ""

followthemoney/translations/fr/LC_MESSAGES/followthemoney.po

@@ -452,7 +452,7 @@ msgstr "Comptes bancaires"
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 "Un compte détenu dans une banque et contrôlé par un propriétaire. Cette "
@@ -1639,7 +1639,7 @@ msgstr "Documentations"
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 "Associe une entité à un document qui est susceptible d’apporter plus "
@@ -2791,7 +2791,7 @@ msgstr "Organisations"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  jurisdiction.\n"
+"enterprises, depending on their jurisdiction.\n"
 msgstr ""
 
 #. Ownership.label
@@ -3164,7 +3164,7 @@ msgstr ""
 #. Position.description
 #: followthemoney/schema/Position.yaml
 msgid ""
-"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a  specific point in time.\n"
+"A post, role or position within an organization or body. This describes a position one or more people may occupy and not the occupation of the post by a specific individual at a specific point in time.\n"
 "'subnationalArea' should be used to further restrict the scope of the position. It should not simply represent some regional aspect of the role - e.g. the constituency of a national member of parliament - when their legislative jurisdiction is nationwide.\n"
 msgstr ""
 
@@ -3196,7 +3196,7 @@ msgstr ""
 #. Post.description
 #: followthemoney/schema/Post.yaml
 msgid ""
-"A post, role or position held by an individual within an organization  or "
+"A post, role or position held by an individual within an organization or "
 "body. This describes the period for which the position is held, not the "
 "abstract concept of the post.\n"
 msgstr ""

followthemoney/translations/fr/followthemoney.po

@@ -442,7 +442,7 @@ msgstr "Comptes bancaires"
 #: followthemoney/schema/BankAccount.yaml
 msgid ""
 "An account held at a bank and controlled by an owner. This may also be used"
-"  to describe more complex arrangements like correspondent bank settlement "
+" to describe more complex arrangements like correspondent bank settlement "
 "accounts.\n"
 msgstr ""
 "Un compte détenu dans une banque et contrôlé par un propriétaire. Cette "
@@ -1368,7 +1368,7 @@ msgstr "Documentations"
 #. Documentation.description
 #: followthemoney/schema/Documentation.yml
 msgid ""
-"Links some entity to a document, which might provide further detail or  "
+"Links some entity to a document, which might provide further detail or "
 "evidence regarding the entity.\n"
 msgstr ""
 "Associe une entité à un document qui est susceptible d’apporter plus "
@@ -2465,7 +2465,7 @@ msgstr "Organisations"
 msgid ""
 "Any type of incorporated entity that cannot be owned by another (see "
 "Company). This might include charities, foundations or state-owned "
-"enterprises, depending on their  juristiction.\n"
+"enterprises, depending on their juristiction.\n"
 msgstr ""
 "Tout type d’entité constituée qui ne peut être détenue par une autre (voir "
 "Société). Il peut s’agir d’une organisation caritative, d’une fondation ou "