followthemoney 3.7.8__tar.gz → 3.7.9__tar.gz

{followthemoney-3.7.8/followthemoney.egg-info → followthemoney-3.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: followthemoney
-Version: 3.7.8
+Version: 3.7.9
 Home-page: https://followthemoney.tech/
 Author: Organized Crime and Corruption Reporting Project
 Author-email: data@occrp.org

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney/__init__.py

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

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney/schema/LegalEntity.yaml

@@ -130,6 +130,11 @@ LegalEntity:
       description: "Data Universal Numbering System - Dun & Bradstreet identifier"
       type: identifier
       maxLength: 16
+    uniqueEntityId:
+      label: "Unique Entity ID"
+      description: "UEI from SAM.gov"
+      type: identifier
+      maxLength: 32
     npiCode:
       label: "NPI"
       description: "National Provider Identifier"

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney/schema/Vessel.yaml

@@ -44,6 +44,7 @@ Vessel:
       type: identifier
     pastFlags:
       label: Past Flags
+      type: country
     pastTypes:
       label: Past Types
     #buildDate:

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney/types/language.py

@@ -4,7 +4,7 @@ from rigour.langs import iso_639_alpha3
 
 from followthemoney.types.common import EnumType, EnumValues
 from followthemoney.rdf import URIRef, Identifier
-from followthemoney.util import defer as _
+from followthemoney.util import defer as _, gettext
 from followthemoney.util import get_env_list
 
 if TYPE_CHECKING:
@@ -93,12 +93,16 @@ class LanguageType(EnumType):
     LANGUAGES = [lang.lower().strip() for lang in LANGUAGES]
 
     def _locale_names(self, locale: Locale) -> EnumValues:
-        names = {}
+        names = {
+            "ara": gettext("Arabic"),
+            "nor": gettext("Norwegian"),
+        }
         for lang in self.LANGUAGES:
-            names[lang] = lang
+            if lang not in names:
+                names[lang] = lang
         for code, label in locale.languages.items():
             code = iso_639_alpha3(code)
-            if code in self.LANGUAGES:
+            if code in self.LANGUAGES and names[code] == code:
                 names[code] = label
         return names
 

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney/types/name.py

@@ -1,8 +1,9 @@
 from typing import TYPE_CHECKING, Optional, Sequence
-from rigour.text.distance import levenshtein_similarity
-from rigour.names import pick_name
 from normality import slugify
 from normality.cleaning import collapse_spaces, strip_quotes
+from rigour.env import MAX_NAME_LENGTH
+from rigour.names import pick_name
+from rigour.text.distance import levenshtein_similarity
 from fingerprints.cleanup import clean_name_light
 
 from followthemoney.types.common import PropertyType
@@ -27,7 +28,7 @@ class NameType(PropertyType):
     plural = _("Names")
     matchable = True
     pivot = True
-    max_length = 384
+    max_length = MAX_NAME_LENGTH
 
     def clean_text(
         self,

{followthemoney-3.7.8 → followthemoney-3.7.9/followthemoney.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: followthemoney
-Version: 3.7.8
+Version: 3.7.9
 Home-page: https://followthemoney.tech/
 Author: Organized Crime and Corruption Reporting Project
 Author-email: data@occrp.org

{followthemoney-3.7.8 → followthemoney-3.7.9}/followthemoney.egg-info/requires.txt

@@ -3,7 +3,7 @@ pyyaml<7.0.0,>=5.0.0
 types-PyYAML
 sqlalchemy2-stubs
 banal<1.1.0,>=1.0.6
-rigour<1.0.0,>=0.7.1
+rigour<1.0.0,>=0.7.2
 click<9.0.0,>=8.0
 stringcase<2.0.0,>=1.2.0
 requests<3.0.0,>=2.21.0

{followthemoney-3.7.8 → followthemoney-3.7.9}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
 
 setup(
     name="followthemoney",
-    version="3.7.8",
+    version="3.7.9",
     author="Organized Crime and Corruption Reporting Project",
     author_email="data@occrp.org",
     url="https://followthemoney.tech/",
@@ -35,7 +35,7 @@ setup(
         "types-PyYAML",
         "sqlalchemy2-stubs",
         "banal >= 1.0.6, < 1.1.0",
-        "rigour >= 0.7.1, < 1.0.0",
+        "rigour >= 0.7.2, < 1.0.0",
         "click >= 8.0, < 9.0.0",
         "stringcase >= 1.2.0, < 2.0.0",
         "requests >= 2.21.0, < 3.0.0",