ftmq 4.3.1__tar.gz → 4.3.2__tar.gz

{ftmq-4.3.1 → ftmq-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ftmq
-Version: 4.3.1
+Version: 4.3.2
 Summary: followthemoney query dsl and io helpers
 License: AGPLv3+
 License-File: LICENSE
@@ -39,7 +39,7 @@ Requires-Dist: pycountry (>=24.6.1,<25.0.0)
 Requires-Dist: pydantic (>=2.11.3,<3.0.0)
 Requires-Dist: pyicu (>=2.15.2,<3.0.0)
 Requires-Dist: redis (>=5.2.1,<6.0.0) ; extra == "redis"
-Requires-Dist: rigour (>=1.4.0,<2.0.0)
+Requires-Dist: rigour (>=1.4.1,<2.0.0)
 Requires-Dist: sqlalchemy (>=2.0.36,<3.0.0) ; extra == "postgres"
 Requires-Dist: sqlalchemy (>=2.0.36,<3.0.0) ; extra == "sql"
 Project-URL: Documentation, https://docs.investigraph.dev/lib/ftmq

{ftmq-4.3.1 → ftmq-4.3.2}/ftmq/__init__.py

@@ -2,7 +2,7 @@ from ftmq.io import smart_read_proxies, smart_write_proxies
 from ftmq.query import Query
 from ftmq.util import make_entity
 
-__version__ = "4.3.1"
+__version__ = "4.3.2"
 __all__ = [
     "smart_read_proxies",
     "smart_write_proxies",

{ftmq-4.3.1 → ftmq-4.3.2}/ftmq/model/dataset.py

@@ -16,6 +16,7 @@ ContentType = Literal["documents", "structured", "mixed"]
 
 
 class Dataset(BaseModel, _DatasetModel):
+    prefix: str | None = None
     maintainer: DataPublisher | None = None
     stats: DatasetStats = DatasetStats()
     git_repo: AnyUrl | None = None

{ftmq-4.3.1 → ftmq-4.3.2}/ftmq/util.py

@@ -13,7 +13,7 @@ from followthemoney.proxy import EntityProxy
 from followthemoney.schema import Schema
 from followthemoney.types import registry
 from followthemoney.util import make_entity_id, sanitize_text
-from normality import collapse_spaces, latinize_text, slugify
+from normality import latinize_text, slugify, squash_spaces
 from rigour.names import Name, Symbol, tag_org_name, tag_person_name
 from rigour.names.tokenize import normalize_name
 from rigour.text.scripts import can_latinize
@@ -321,7 +321,7 @@ def clean_string(value: Any) -> str | None:
     value = sanitize_text(value)
     if value is None:
         return
-    return collapse_spaces(value)
+    return squash_spaces(value)
 
 
 def clean_name(value: Any) -> str | None:

{ftmq-4.3.1 → ftmq-4.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ftmq"
-version = "4.3.1"
+version = "4.3.2"
 description = "followthemoney query dsl and io helpers"
 authors = [{ name = "Simon Wörpel", email = "simon.woerpel@pm.me" }]
 license = "AGPLv3+"
@@ -18,7 +18,7 @@ dependencies = [
     "anystore (>=0.4.0,<0.5.0)",
     "followthemoney (>=4.3.2,<5.0.0)",
     "nomenklatura (>=4.1.10,<5.0.0)",
-    "rigour (>=1.4.0,<2.0.0)",
+    "rigour (>=1.4.1,<2.0.0)",
     "click (>=8.2.1,<9.0.0)",
     "click-default-group (>=1.2.4,<2.0.0)",
     "orjson (>=3.10.18,<4.0.0)",