From f211592795e1ba5eaa2d4ecca7eeb1721d5ba9f7 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 1 Apr 2024 16:33:59 +0200 Subject: [PATCH] feat: unvendor whistle --- .gitmodules | 3 --- poetry.lock | 37 ++++++++++++++++++++++--------------- pyproject.toml | 4 +--- vendors/whistle | 1 - 4 files changed, 23 insertions(+), 22 deletions(-) delete mode 160000 vendors/whistle diff --git a/.gitmodules b/.gitmodules index 6ae3f6b0..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vendors/whistle"] - path = vendors/whistle - url = https://github.com/msqd/whistle.git diff --git a/poetry.lock b/poetry.lock index e69a615c..04ff4865 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1985,6 +1985,7 @@ files = [ {file = "psycopg2_binary-2.9.9-cp311-cp311-win32.whl", hash = "sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d"}, {file = "psycopg2_binary-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf"}, + {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996"}, @@ -1993,6 +1994,8 @@ files = [ {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb"}, {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe"}, + {file = "psycopg2_binary-2.9.9-cp312-cp312-win32.whl", hash = "sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93"}, + {file = "psycopg2_binary-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab"}, {file = "psycopg2_binary-2.9.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a"}, {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9"}, {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77"}, @@ -2298,6 +2301,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -3067,13 +3071,13 @@ python-baseconv = "*" [[package]] name = "testcontainers" -version = "4.2.0" +version = "4.3.0" description = "Python library for throwaway instances of anything that can run in a Docker container" optional = false python-versions = "<4.0,>=3.9" files = [ - {file = "testcontainers-4.2.0-py3-none-any.whl", hash = "sha256:64d24b1a3c9ce6ca67434e91771a9070b174f6912c3be729d506361d098f51f4"}, - {file = "testcontainers-4.2.0.tar.gz", hash = "sha256:ee06222f17594dc41ee15b6f19c5758bc47e1c546082e80edde21a6c8ae59126"}, + {file = "testcontainers-4.3.0-py3-none-any.whl", hash = "sha256:8e1b6963c51eb103e386969ba4d388297596ecaf4cdce34baaafe645abf94bbd"}, + {file = "testcontainers-4.3.0.tar.gz", hash = "sha256:c6ce2ff358c7b29f30ae9a375c7abffc8724585c2749ab96dede7983edfa7c9c"}, ] [package.dependencies] @@ -3084,23 +3088,28 @@ wrapt = "*" [package.extras] arangodb = ["python-arango (>=7.8,<8.0)"] azurite = ["azure-storage-blob (>=12.19,<13.0)"] +chroma = ["chromadb-client"] clickhouse = ["clickhouse-driver"] -google = ["google-cloud-pubsub (>=2)"] +google = ["google-cloud-datastore (>=2)", "google-cloud-pubsub (>=2)"] influxdb = ["influxdb", "influxdb-client"] k3s = ["kubernetes", "pyyaml"] -kafka = ["kafka-python"] keycloak = ["python-keycloak"] localstack = ["boto3"] minio = ["minio"] mongodb = ["pymongo"] mssql = ["pymssql", "sqlalchemy"] mysql = ["pymysql[rsa]", "sqlalchemy"] +nats = ["nats-py"] neo4j = ["neo4j"] opensearch = ["opensearch-py"] -oracle = ["cx_Oracle", "sqlalchemy"] +oracle = ["oracledb", "sqlalchemy"] +oracle-free = ["oracledb", "sqlalchemy"] +qdrant = ["qdrant-client"] rabbitmq = ["pika"] redis = ["redis"] +registry = ["bcrypt"] selenium = ["selenium"] +weaviate = ["weaviate-client (>=4.5.4,<5.0.0)"] [[package]] name = "tornado" @@ -3274,16 +3283,14 @@ anyio = ">=3.0.0" [[package]] name = "whistle" -version = "2.0.dev" +version = "2.0.0a1" description = "Event dispatcher (see python-whistle.github.io)." optional = false -python-versions = ">=3.9,<4.0" -files = [] -develop = true - -[package.source] -type = "directory" -url = "vendors/whistle" +python-versions = "<4.0,>=3.9" +files = [ + {file = "whistle-2.0.0a1-py3-none-any.whl", hash = "sha256:81ad3c6e13dee62c32155821f913c2cf2d3df8714dcca92b79ea1e1f75ea73ef"}, + {file = "whistle-2.0.0a1.tar.gz", hash = "sha256:283eb7962e764f68337769154daea38bf6113807e1b8dbbc211e71719dadb3bd"}, +] [[package]] name = "wrapt" @@ -3502,4 +3509,4 @@ dev = ["honcho", "watchfiles"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "24a35eb9d0899e0660938b287f902ff69244f2a4a1b4efe4e4d34fa906cf8304" +content-hash = "e392980790af8b03d331c30e0bdc78c0b1d333ea6e30e52f941bd4558ca553c7" diff --git a/pyproject.toml b/pyproject.toml index 5fbba003..bf237a99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,10 +42,8 @@ sentry-sdk = "^1.44.0" essentials-configuration = "^2.0.4" rodi = "^2.0.6" pyyaml = "^6.0.1" +whistle = { version = "2.0.0a1", allow-prereleases = true } -[tool.poetry.dependencies.whistle] -path = "./vendors/whistle" -develop = true [tool.poetry.group.dev.dependencies] asgi-tools = "^0.76.0" diff --git a/vendors/whistle b/vendors/whistle deleted file mode 160000 index 30ed3421..00000000 --- a/vendors/whistle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30ed3421c1b99e39ec5521221e5933741be57d5e