diff --git a/Dockerfile b/Dockerfile index 761c145f724..26c2907b177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends \ build-essential \ cmake \ + git \ libssl-dev \ zlib1g-dev \ libffi-dev \ diff --git a/docker/env/version b/docker/env/version index 802c8c7e487..d4073c1afa4 100644 --- a/docker/env/version +++ b/docker/env/version @@ -1 +1 @@ -1.135-PR14512-237ad27 +1.136-PR14708-470fbf5 diff --git a/pyproject.toml b/pyproject.toml index 209ac2134de..f50f032be6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,7 @@ dependencies = [ "questionary==2.1.1", "requests==2.33.0", "rich==15.0.0", - "scylla-driver==3.29.10", + "scylla-driver", "sortedcontainers==2.4.0", "ssh2-python>=1.1.2.post1", "tcconfig==0.29.1", @@ -98,6 +98,7 @@ environments = ["sys_platform != 'win32'"] build-constraint-dependencies = ["setuptools>=65.0.0,<75"] [tool.uv.sources] +scylla-driver = { git = "https://github.com/vponomaryov/python-driver.git", branch = "fix-race-issue-614" } ssh2-python = [ { url = "https://roy-rpms.s3.us-east-1.amazonaws.com/ssh2_python-1.2.0.post1%2B0.gc92aa3e.dirty-cp314-cp314-macosx_26_0_arm64.whl", marker = "sys_platform == 'darwin' and platform_machine == 'arm64' and python_version == '3.14'" }, ] diff --git a/uv.lock b/uv.lock index 0776b14be2e..32746cc9c53 100644 --- a/uv.lock +++ b/uv.lock @@ -4236,7 +4236,7 @@ requires-dist = [ { name = "questionary", specifier = "==2.1.1" }, { name = "requests", specifier = "==2.33.0" }, { name = "rich", specifier = "==15.0.0" }, - { name = "scylla-driver", specifier = "==3.29.10" }, + { name = "scylla-driver", git = "https://github.com/vponomaryov/python-driver.git?branch=fix-race-issue-614" }, { name = "sortedcontainers", specifier = "==2.4.0" }, { name = "ssh2-python", marker = "python_full_version != '3.14.*' or platform_machine != 'arm64' or sys_platform != 'darwin'", specifier = ">=1.1.2.post1" }, { name = "ssh2-python", marker = "python_full_version == '3.14.*' and platform_machine == 'arm64' and sys_platform == 'darwin'", url = "https://roy-rpms.s3.us-east-1.amazonaws.com/ssh2_python-1.2.0.post1%2B0.gc92aa3e.dirty-cp314-cp314-macosx_26_0_arm64.whl" }, @@ -4263,37 +4263,11 @@ profiling = [ [[package]] name = "scylla-driver" version = "3.29.10" -source = { registry = "https://pypi.org/simple" } +source = { git = "https://github.com/vponomaryov/python-driver.git?branch=fix-race-issue-614#5dbc94b6cb13eb41f8485a71325be058885118c7" } dependencies = [ { name = "geomet", marker = "sys_platform != 'win32'" }, { name = "pyyaml", marker = "sys_platform != 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/06/91/a8094825e1e6cdfea6f7fbb1b22e163520f73b18c649110e21bad25e0631/scylla_driver-3.29.10.tar.gz", hash = "sha256:fcd5852f404c9c57e08b1641f670cce0eab88a1fded0e8f2b4f5ba32320880d6", size = 315264, upload-time = "2026-05-10T13:27:08.677Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/19/c0/4e63c82b7d271c70612db3a0cc2797766fc2e3d60a62cba7e76744f87f3d/scylla_driver-3.29.10-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:e0fabf721a730f56dfe887312dca079bc2058b32f299a94fb7e63f950b4fbd93", size = 3215155, upload-time = "2026-05-10T13:25:53.472Z" }, - { url = "https://files.pythonhosted.org/packages/9a/ec/d2700dff40c529f6460e938f12a353364d8c8292ba3acfa8c1cc4b602cda/scylla_driver-3.29.10-cp310-cp310-macosx_15_0_x86_64.whl", hash = "sha256:ed1451a6d25baac862c32a45c19f0aeb051fad4534d0e9c277cf4fa11620886d", size = 3588728, upload-time = "2026-05-10T13:25:56.379Z" }, - { url = "https://files.pythonhosted.org/packages/1b/70/79b315e65da35b1ef0e6e1ab3fc4666875b83468175137cfe878bb69f38a/scylla_driver-3.29.10-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c17e6447b2c9a66c2ab262e7192df02dcd76e87da1b4d08a18021711655fbd75", size = 4102728, upload-time = "2026-05-10T13:25:58.872Z" }, - { url = "https://files.pythonhosted.org/packages/15/e4/9b36e66b41bc062952e5c90d06bfb75e5a27ca620a7d129929bc4784dfc8/scylla_driver-3.29.10-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f629809c96050c1ddd72da336844606210a112a0bd7fc4e1dc6bf4149dc400aa", size = 4394629, upload-time = "2026-05-10T13:26:01.083Z" }, - { url = "https://files.pythonhosted.org/packages/64/6d/f1d37aa7a9f68ea740aea583df1a4d372fdb3075b09ed5d5952fc37f73dc/scylla_driver-3.29.10-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a989e7512aaa6e07e4943fc06f2a9bed73e24df1ab03c8f7d6c4c950ab633ab0", size = 3176912, upload-time = "2026-05-10T13:26:07.894Z" }, - { url = "https://files.pythonhosted.org/packages/b5/d6/30e1cb1395781ee8eb985e4c04fb371f2b9cd5381e30a08121d5b87ec050/scylla_driver-3.29.10-cp311-cp311-macosx_15_0_x86_64.whl", hash = "sha256:f9ca8117ca7b9811624177683e5e8a675f6c2f771a99451582358f17fab4a2c2", size = 3565856, upload-time = "2026-05-10T13:26:10.16Z" }, - { url = "https://files.pythonhosted.org/packages/fd/bf/ad62626d0c008e861452fc6ce86e741e900fbf63e59037cadb4077f61897/scylla_driver-3.29.10-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:51710d01878f67292afa2d1071c5077ef23cdfd2cb9be939784a29b56dbe64a2", size = 3992641, upload-time = "2026-05-10T13:26:12.55Z" }, - { url = "https://files.pythonhosted.org/packages/94/12/00942a7b9fce7b9b4e7f14e3d2134ae89fd4d28bbde9bf1ea141d3ad3f98/scylla_driver-3.29.10-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0a1f38c37740aa6f534886e2ff05c60b153f927d3899b1a0258a92525bbae0d6", size = 4254139, upload-time = "2026-05-10T13:26:14.826Z" }, - { url = "https://files.pythonhosted.org/packages/3c/f7/bdd0bc3d71a57169c73de78fab366b68480688c811a6b5eb083f8b97d739/scylla_driver-3.29.10-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:7ced2e6a2accc779e699f6f94c7399d1122166e13609dc08b9604f1be5bf932a", size = 3224921, upload-time = "2026-05-10T13:26:20.883Z" }, - { url = "https://files.pythonhosted.org/packages/ec/aa/cc2a4fb79e54da560f2624c92fc88086b3714ee9fa357c682b7875b56af3/scylla_driver-3.29.10-cp312-cp312-macosx_15_0_x86_64.whl", hash = "sha256:00d8553888394131642b3af0d2c7ee6186c58a749526013e4672c6800c5f7490", size = 3626575, upload-time = "2026-05-10T13:26:23.143Z" }, - { url = "https://files.pythonhosted.org/packages/cc/35/b68769ef8837d748ef99e29fcbde98df412afae1f35194e24c3964b1cb6c/scylla_driver-3.29.10-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a5b66117b220053ab156ff9e05d0c6e73e4fec7b1a116af810d44220e441945a", size = 3766578, upload-time = "2026-05-10T13:26:25.823Z" }, - { url = "https://files.pythonhosted.org/packages/4f/d2/d87e2bde2e5d1c3b079ea6a2c0adfae8e4ff7a535c37cab56efad2bfd5f3/scylla_driver-3.29.10-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c08354f810c48edc56d2ce6a08dae67344457a478a39553f2425d1c9f8a8de7f", size = 4048212, upload-time = "2026-05-10T13:26:28.942Z" }, - { url = "https://files.pythonhosted.org/packages/65/38/f98bdea2ae7b2f2b415f1db0ac0e49c829c19f28a01d42747a6e9c562227/scylla_driver-3.29.10-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:3076cd9a37be6b27047586a9f82606fdddfaea6b76acb7a3287da862e7abe8d9", size = 3310946, upload-time = "2026-05-10T13:26:35.007Z" }, - { url = "https://files.pythonhosted.org/packages/fa/f9/5e01f41a97e9b1a87476723ef5589ebf48f633373fea80fccff2e54b70e4/scylla_driver-3.29.10-cp313-cp313-macosx_15_0_x86_64.whl", hash = "sha256:7811955720f879847b1fac16927859075970c7b8c9cf73c822d1798358298d9e", size = 3712282, upload-time = "2026-05-10T13:26:37.848Z" }, - { url = "https://files.pythonhosted.org/packages/24/3a/793d15903ddbd3af8ecec8f6b17e0ff807b45c1fa91a574fc97992d1d36e/scylla_driver-3.29.10-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c41526f90ef1c6d7f02bff4ff9318925ab1a2de88e557dbd3e3de6af38622305", size = 3749590, upload-time = "2026-05-10T13:26:40.255Z" }, - { url = "https://files.pythonhosted.org/packages/f9/e3/70c74ebd377814c41e854a1128011003b4abc03693dec3f702f73f38755e/scylla_driver-3.29.10-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6b38d3c54414c784e3934799fb4e67f289ed2035b0dd7b710f7cfe1bfb626bf9", size = 4018289, upload-time = "2026-05-10T13:26:42.174Z" }, - { url = "https://files.pythonhosted.org/packages/0c/f5/598a8e403a3c5d9bed08c1c1bd88907fea4efc160dabdb76f6f72d0f02fe/scylla_driver-3.29.10-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:77a827d8f8e64fb3f8b2a5ed4fb548206a815629d4fd2724c6254e77ede5f452", size = 3341010, upload-time = "2026-05-10T13:26:48.61Z" }, - { url = "https://files.pythonhosted.org/packages/6d/b6/a0a385f32f4f2b67b64f138ffcb65e422be6b3be983955c0b04d7421db7b/scylla_driver-3.29.10-cp314-cp314-macosx_15_0_x86_64.whl", hash = "sha256:e0e358af22ba5cfc63fb88081b6c39f80c897157b335cdb20046873854ed4c3b", size = 3717170, upload-time = "2026-05-10T13:26:50.74Z" }, - { url = "https://files.pythonhosted.org/packages/7c/a3/2f372ac7464eedd7c018e575e35509dbd5f9184bab3b59234d5bfbf02aa9/scylla_driver-3.29.10-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0a28d164fe451e75af5023b44e7b6c8dc72a749aea9fc5d1d68f3c2e64f501f", size = 3809360, upload-time = "2026-05-10T13:26:53.101Z" }, - { url = "https://files.pythonhosted.org/packages/29/31/ddbfeb1b090fa24a08dab7fd1ea5a8e1374401f632a6a17548d4dcc6d9aa/scylla_driver-3.29.10-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e9bcfe1b3b98f62ad83e07562a193bb6e62ecf69b7432c927b69aca70b17c5bd", size = 4031711, upload-time = "2026-05-10T13:26:55.441Z" }, - { url = "https://files.pythonhosted.org/packages/1e/05/e6a857f02e1292af1f17725333253c22d124b07d1c8e8280e03663d349cd/scylla_driver-3.29.10-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:6e67946089555579880e6a93d21b1f8ac35d66037f8ea914bc00fa415bc52e16", size = 364160, upload-time = "2026-05-10T13:27:02.108Z" }, - { url = "https://files.pythonhosted.org/packages/4b/9a/00023b6dd8a44f270cf6312eb632a95603e54d1d418c187dadb750f518d1/scylla_driver-3.29.10-pp311-pypy311_pp73-macosx_15_0_x86_64.whl", hash = "sha256:c079e2c48dd05e07c92acd8dac129e8c2d5ba91551e9ee6f05da2f322c521008", size = 363671, upload-time = "2026-05-10T13:27:03.602Z" }, - { url = "https://files.pythonhosted.org/packages/a0/78/a80d4e705a6976e591dfcd86a310bf0491c20ab9d002d7094b1ce1714ef1/scylla_driver-3.29.10-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:638b233a77c14bd7a6086f70b6963be0e13f3db98db6fd024e0c645a7de18744", size = 364908, upload-time = "2026-05-10T13:27:05.391Z" }, -] [[package]] name = "secretstorage"