Merge pull request #17 from investigativedata/develop

v0.2.1
investigativedata · Nov 14, 2023 · a7303a7 · a7303a7
2 parents f76af0b + c93a425
commit a7303a7
Show file tree

Hide file tree

Showing 9 changed files with 1,754 additions and 1,646 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 commit = True
 tag = True
 message = 🔖 Bump version: {current_version} → {new_version}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## CHANGELOG
 
+### 0.2.1 (2023-11-14)
+
+- Dependency upgrades (mainly `ftmq` which switched to pydantic v2)
+
 ### 0.2.0 (2023-10-20)
 
 - Refactor to follow [`ftmq`](https://github.com/investigativedata/ftmq) store implementation
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/ftm_columnstore/__init__.py b/ftm_columnstore/__init__.py
@@ -16,6 +16,6 @@
 # FIXME sqlalchemy monkey patch not working
 nomenklatura.settings.DB_URL = "sqlite:///:memory:"
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 __all__ = ["get_engine", "get_store"]
diff --git a/ftm_columnstore/settings.py b/ftm_columnstore/settings.py
@@ -1,6 +1,6 @@
 import os
 
-VERSION = "0.2.0"
+VERSION = "0.2.1"
 
 
 def get_env(name, default=None):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ftm-columnstore"
-version = "0.2.0"
+version = "0.2.1"
 description = "Column store implementation for ftm data based on clickhouse"
 authors = ["Simon Wörpel <[email protected]>"]
 license = "GPL3"
@@ -28,27 +28,28 @@ python = ">=3.11,<3.12"
 banal = "^1.0.6"
 typer = "^0.9.0"
 clickhouse-driver = {extras = ["numpy"], version = "^0.2.6"}
-orjson = "^3.9.4"
-pyicu = "^2.11"
+orjson = "^3.9.10"
+pyicu = "^2.12"
 libindic-soundex = "^1.0.2"
 libindic-utils = "^1.0.3"
 metaphone = "^0.6"
-pandas = "^2.0.3"
-rich = "^13.5.2"
-ftmq = "^0.4.0"
+pandas = "^2.1.3"
+rich = "^13.6.0"
+ftmq = "^0.5.0"
 
 
 [tool.poetry.group.dev.dependencies]
 absolufy-imports = "^0.3.1"
 ipdb = "^0.13.13"
-black = "^23.7.0"
+black = "^23.11.0"
 isort = "^5.12.0"
 flake8 = "^6.1.0"
-mypy = "^1.4.1"
-pytest = "^7.4.0"
+mypy = "^1.7.0"
+pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
-pytest-env = ">=0.8.2,<1.1.0"
-pre-commit = "^3.3.3"
+pytest-env = ">=1.1.1"
+pre-commit = "^3.5.0"
+bump2version = "^1.0.1"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/requirements.txt b/requirements.txt
diff --git a/tests/test_store.py b/tests/test_store.py
@@ -113,9 +113,11 @@ def test_store_queries(ec_meetings, eu_authorities):
     # coverage
     q = Query().where(dataset="eu_authorities")
     coverage = view.coverage(q)
-    assert coverage.countries == [{"code": "eu", "label": "eu", "count": 151}]
+    assert [c.model_dump() for c in coverage.countries] == [
+        {"code": "eu", "label": "eu", "count": 151}
+    ]
     assert coverage.entities == 151
-    assert coverage.schemata == [
+    assert [s.model_dump() for s in coverage.schemata] == [
         {
             "name": "PublicBody",
             "label": "Public body",