From ccc9c1e0ad7153535d15fe0d99107df8394afa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20W=C3=B6rpel?= Date: Thu, 28 Sep 2023 16:28:27 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20ftmq=200.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 44 ++++++++++++++++++++------------------------ pyproject.toml | 2 +- requirements.txt | 4 +++- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/poetry.lock b/poetry.lock index a0f5e4c..82b725e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1185,38 +1185,34 @@ tqdm = ["tqdm"] [[package]] name = "ftmq" -version = "0.3.1" +version = "0.3.2" description = "followthemoney query dsl and io helpers" optional = false python-versions = ">=3.10,<3.13" -files = [] -develop = false +files = [ + {file = "ftmq-0.3.2-py3-none-any.whl", hash = "sha256:83c53bf34dfa9db3110e2ceb74f8c3897657f800f4031fc678f96d8122defa15"}, + {file = "ftmq-0.3.2.tar.gz", hash = "sha256:cc089e7d32255afe57ba6dd5dc1e503a85d11fbec24ec2577c0c48fc397f8866"}, +] [package.dependencies] -adlfs = "^2023.4.0" -alephclient = "^2.3.6" -banal = "^1.0.6" +adlfs = ">=2023.4.0,<2024.0.0" +alephclient = ">=2.3.6,<3.0.0" +banal = ">=1.0.6,<2.0.0" certifi = ">=2023.07.22" -click = "^8.1.3" -click-default-group = "^1.2.2" +click = ">=8.1.3,<9.0.0" +click-default-group = ">=1.2.2,<2.0.0" cryptography = ">=41.0.4" -followthemoney = "^3.5.4" -fsspec = "^2023.6.0" -gcsfs = "^2023.6.0" -nomenklatura = "^3.4.0" -orjson = "^3.9.1" -pycountry = "^22.3.5" +followthemoney = ">=3.5.4,<4.0.0" +fsspec = ">=2023.6.0,<2024.0.0" +gcsfs = ">=2023.6.0,<2024.0.0" +nomenklatura = ">=3.4.0,<4.0.0" +orjson = ">=3.9.1,<4.0.0" +pycountry = ">=22.3.5,<23.0.0" pydantic = "<2" -PyICU = "^2.11" -s3fs = "^2023.6.0" +PyICU = ">=2.11,<3.0" +s3fs = ">=2023.6.0,<2024.0.0" scipy = ">=1.10.0" -sqlalchemy = "^2.0.19" - -[package.source] -type = "git" -url = "https://github.com/investigativedata/ftmq.git" -reference = "develop" -resolved_reference = "71ae6d09e2ec5bc6bcdcc0d9d313e9ccd0fc563d" +sqlalchemy = ">=2.0.19,<3.0.0" [[package]] name = "furl" @@ -4551,4 +4547,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "057453ebab89a1d3d6e48345e5e7414b32e80468178d393304da32b19af43ede" +content-hash = "5b0ef6239116f2ce14ec9d042394ab175ab851a2b1ca195b1cc1a2451b6ff45d" diff --git a/pyproject.toml b/pyproject.toml index 59d2dce..2a1f2ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ fastapi = {extras = ["all"], version = "<0.100"} furl = "^2.1.3" redis = "^5.0.0" pyicu = "^2.11" -ftmq = {git = "https://github.com/investigativedata/ftmq.git", rev = "develop"} +ftmq = "^0.3.2" structlog = "^23.1.0" fakeredis = "^2.18.0" diff --git a/requirements.txt b/requirements.txt index 3cf50f1..8610a27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -568,7 +568,9 @@ frozenlist==1.4.0 ; python_version >= "3.10" and python_version < "3.13" \ fsspec==2023.9.2 ; python_version >= "3.10" and python_version < "3.13" \ --hash=sha256:603dbc52c75b84da501b9b2ec8c11e1f61c25984c4a0dda1f129ef391fbfc9b4 \ --hash=sha256:80bfb8c70cc27b2178cc62a935ecf242fc6e8c3fb801f9c571fc01b1e715ba7d -ftmq @ git+https://github.com/investigativedata/ftmq.git@develop ; python_version >= "3.10" and python_version < "3.13" +ftmq==0.3.2 ; python_version >= "3.10" and python_version < "3.13" \ + --hash=sha256:83c53bf34dfa9db3110e2ceb74f8c3897657f800f4031fc678f96d8122defa15 \ + --hash=sha256:cc089e7d32255afe57ba6dd5dc1e503a85d11fbec24ec2577c0c48fc397f8866 furl==2.1.3 ; python_version >= "3.10" and python_version < "3.13" \ --hash=sha256:5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e \ --hash=sha256:9ab425062c4217f9802508e45feb4a83e54324273ac4b202f1850363309666c0