From bacfd0ef10c48ee197e67f586163c12aa72558b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20W=C3=B6rpel?= Date: Fri, 3 Jan 2025 08:59:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20anystore,=20ftm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 22 +++++++++++++--------- pyproject.toml | 4 ++-- requirements.txt | 12 ++++++------ 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/poetry.lock b/poetry.lock index ef7c79b..41e9a59 100644 --- a/poetry.lock +++ b/poetry.lock @@ -215,13 +215,13 @@ files = [ [[package]] name = "anystore" -version = "0.2.1" +version = "0.2.2" description = "Store and cache things anywhere" optional = false python-versions = "<4,>=3.11" files = [ - {file = "anystore-0.2.1-py3-none-any.whl", hash = "sha256:0bde6c33a009572c659ba147b97c4d33e131c666e98eb27dfa39b2437eaefd47"}, - {file = "anystore-0.2.1.tar.gz", hash = "sha256:acafef84bd6bcac3f0f86dd0cb252346d37b8fd0f1d1bc6046bd1f9a78471d18"}, + {file = "anystore-0.2.2-py3-none-any.whl", hash = "sha256:3c1d549641896533328227d060cc1754e7a5e6d1132bea9d49f41c8391c9af36"}, + {file = "anystore-0.2.2.tar.gz", hash = "sha256:57c7ee5949df61a5ac3dc183f6f5cdf3e082070e8c083bdea3c4e8433ac7d44b"}, ] [package.dependencies] @@ -232,7 +232,7 @@ cryptography = ">=42.0.4" fsspec = ">2023.10,<2025" gcsfs = ">2023.10,<2025" orjson = ">=3.9.15,<4.0.0" -pyaml = ">=23.12,<25.0" +pyaml = ">=23.12,<26.0" pydantic = ">=2.6.3,<3.0.0" pydantic-settings = ">=2.2.1,<3.0.0" pytest = ">=8.0.2,<9.0.0" @@ -243,6 +243,10 @@ sshfs = ">=2024.9.0,<2025.0.0" structlog = ">=24.4.0,<25.0.0" typer = ">=0.9,<0.16" +[package.extras] +redis = ["fakeredis (>=2.26.2,<3.0.0)", "redis (>=5.2.1,<6.0.0)"] +sql = ["sqlalchemy (>=2.0.36,<3.0.0)"] + [[package]] name = "asttokens" version = "3.0.0" @@ -1058,13 +1062,13 @@ pyflakes = ">=3.2.0,<3.3.0" [[package]] name = "followthemoney" -version = "3.7.9" +version = "3.7.12" description = "" optional = false python-versions = "*" files = [ - {file = "followthemoney-3.7.9-py2.py3-none-any.whl", hash = "sha256:beaf9e5fcee108b86c1e78cb3b080434ee6a70072a45dbdd6a959bb63a3b96f6"}, - {file = "followthemoney-3.7.9.tar.gz", hash = "sha256:acf24a173e165d38a0bc55c2088f76edeee47f67170f70ef95ae6e146e4fb827"}, + {file = "followthemoney-3.7.12-py2.py3-none-any.whl", hash = "sha256:1f113b524931b58ac13e90adb0890bd89913f7213206f6278e1bb0a413daa8ab"}, + {file = "followthemoney-3.7.12.tar.gz", hash = "sha256:50ee571fcbf3a3c82eaa2fdd711ea7dd4d57a9415993d09aa66c6dedc3c00f0f"}, ] [package.dependencies] @@ -1084,7 +1088,7 @@ pytz = ">=2021.1" pyyaml = ">=5.0.0,<7.0.0" rdflib = ">=6.2.0,<7.2.0" requests = ">=2.21.0,<3.0.0" -rigour = ">=0.7.2,<1.0.0" +rigour = ">=0.8.1,<1.0.0" sqlalchemy = ">=1.4.49,<3.0.0" sqlalchemy2-stubs = "*" stringcase = ">=1.2.0,<2.0.0" @@ -4727,4 +4731,4 @@ sql = ["sqlalchemy"] [metadata] lock-version = "2.0" python-versions = ">=3.11,<4" -content-hash = "8bef51540514ca971f98aad5b7d275c70724ae206725f48eb5d341fb37f19287" +content-hash = "db582bab4e8581c03e4c59424058c36deb85acdb446c22f80d904fc2d4b77935" diff --git a/pyproject.toml b/pyproject.toml index baf8847..3c4626a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ ftmq = "ftmq.cli:cli" [tool.poetry.dependencies] python = ">=3.11,<4" banal = "^1.0.6" -followthemoney = "^3.7.9" +followthemoney = "^3.7.12" orjson = "^3.10.3" PyICU = "^2.13.1" click = "^8.1.7" @@ -40,7 +40,7 @@ alephclient = "^2.4.1" pycountry = ">=23.12.11,<25.0.0" urllib3 = "<3" nomenklatura = "^3.14.0" -anystore = "^0.2.1" +anystore = "^0.2.2" structlog = "^24.4.0" rigour = "^0.8.2" redis = {version = "^5.2.1", optional = true} diff --git a/requirements.txt b/requirements.txt index 8c0e8a9..130e643 100644 --- a/requirements.txt +++ b/requirements.txt @@ -96,9 +96,9 @@ alephclient==2.6.0 ; python_version >= "3.11" and python_version < "4" \ annotated-types==0.7.0 ; python_version >= "3.11" and python_version < "4" \ --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \ --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89 -anystore==0.2.1 ; python_version >= "3.11" and python_version < "4" \ - --hash=sha256:0bde6c33a009572c659ba147b97c4d33e131c666e98eb27dfa39b2437eaefd47 \ - --hash=sha256:acafef84bd6bcac3f0f86dd0cb252346d37b8fd0f1d1bc6046bd1f9a78471d18 +anystore==0.2.2 ; python_version >= "3.11" and python_version < "4" \ + --hash=sha256:3c1d549641896533328227d060cc1754e7a5e6d1132bea9d49f41c8391c9af36 \ + --hash=sha256:57c7ee5949df61a5ac3dc183f6f5cdf3e082070e8c083bdea3c4e8433ac7d44b asttokens==3.0.0 ; python_version >= "3.11" and python_version < "4" \ --hash=sha256:0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7 \ --hash=sha256:e3078351a059199dd5138cb1c706e6430c05eff2ff136af5eb4790f9d28932e2 @@ -473,9 +473,9 @@ fingerprints==1.2.3 ; python_version >= "3.11" and python_version < "4" \ flake8==7.1.1 ; python_version >= "3.11" and python_version < "4" \ --hash=sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38 \ --hash=sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213 -followthemoney==3.7.9 ; python_version >= "3.11" and python_version < "4" \ - --hash=sha256:acf24a173e165d38a0bc55c2088f76edeee47f67170f70ef95ae6e146e4fb827 \ - --hash=sha256:beaf9e5fcee108b86c1e78cb3b080434ee6a70072a45dbdd6a959bb63a3b96f6 +followthemoney==3.7.12 ; python_version >= "3.11" and python_version < "4" \ + --hash=sha256:1f113b524931b58ac13e90adb0890bd89913f7213206f6278e1bb0a413daa8ab \ + --hash=sha256:50ee571fcbf3a3c82eaa2fdd711ea7dd4d57a9415993d09aa66c6dedc3c00f0f frozenlist==1.5.0 ; python_version >= "3.11" and python_version < "4" \ --hash=sha256:000a77d6034fbad9b6bb880f7ec073027908f1b40254b5d6f26210d2dab1240e \ --hash=sha256:03d33c2ddbc1816237a67f66336616416e2bbb6beb306e5f890f2eb22b959cdf \