This is an automated email from the ASF dual-hosted git repository. andreac pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 639a8a8e6503b0cbab22850a3f1b6e504b9698dc Merge: fff6cb5cef 2bb5fcce25 Author: Andrea Child <[email protected]> AuthorDate: Thu Nov 6 14:07:07 2025 -0800 Merge branch '3.8-dev' .github/workflows/build-test.yml | 2 +- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.8.0.asciidoc | 1 + gremlin-console/pom.xml | 4 ++-- gremlin-console/src/test/python/docker/Dockerfile | 2 +- gremlin-console/src/test/python/setup.py | 2 +- gremlin-python/docker-compose.yml | 4 ++-- gremlin-python/src/main/python/pyproject.toml | 4 ++-- .../src/main/python/tests/driver/test_web_socket_client_behavior.py | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --cc gremlin-console/src/test/python/setup.py index d1b2103f72,ec53a8fa26..e903bbc2ae --- a/gremlin-console/src/test/python/setup.py +++ b/gremlin-console/src/test/python/setup.py @@@ -26,13 -26,12 +26,13 @@@ setup name='gremlinconsoletest', test_suite="tests", setup_requires=[ - 'pytest-runner==5.2', - 'importlib-metadata<3.0.0' + 'pytest-runner==6.0.0', + 'importlib-metadata<5.0.0' ], tests_require=[ - 'pytest>=4.6.4,<7.2.0', + 'pytest>=6.2.5,<8.0.0', - 'mock>=3.0.5,<4.0.0', - 'pexpect==4.8.0' + 'mock>=3.0.5,<5.1.0', + 'pexpect==4.9.0', + 'iniconfig<2.0.0' ] ) diff --cc gremlin-python/src/main/python/pyproject.toml index 4f98cef675,75ff315736..8560961174 --- a/gremlin-python/src/main/python/pyproject.toml +++ b/gremlin-python/src/main/python/pyproject.toml @@@ -47,10 -45,10 +47,10 @@@ classifiers = Homepage = "https://tinkerpop.apache.org"; [project.optional-dependencies] -kerberos = ["kerberos>=1.3.0,<2.0.0"] +kerberos = ["kerberos>=1.3.0,<2.0.0; sys_platform != \"win32\""] ujson = ["ujson>=2.0.0"] test = [ - "pytest>=4.6.4,<7.2.0", + "pytest>=6.2.5,<8.0.0", "radish-bdd==0.18.2", "PyHamcrest>=1.9.0,<3.0.0", "PyYAML>=5.3" diff --cc gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py index d237d16f6b,76bad8a685..ea8e6ec96d --- a/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py +++ b/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py @@@ -73,11 -72,37 +73,11 @@@ def test_should_not_include_user_agent_ # If the gremlin user agent is disabled, the underlying web socket library reverts to sending its default user agent # during connection requests. - assert re.search("^Python/(\d\.)*\d aiohttp/(\d\.)*\d", user_agent_response) + assert re.search("^Python/\d+(\.\d+)* aiohttp/\d+(\.\d+)*", user_agent_response) - -# Tests that client does not request permessage deflate compression by default -def test_should_not_request_compression_by_default(socket_server_client, socket_server_settings): - response = socket_server_client.submit( - "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0] - - assert 'permessage-deflate' not in response - - -# Tests that client does not request permessage deflate compression when disabled [email protected]_kwargs({'enable_compression': False}) -def test_should_not_request_compression_when_disabled(socket_server_client, socket_server_settings): - response = socket_server_client.submit( - "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0] - - assert 'permessage-deflate' not in response - - -# Tests that client requests permessage deflate compression when enabled [email protected]_kwargs({'enable_compression': True}) -def test_should_request_compression_when_enabled(socket_server_client, socket_server_settings,): - response = socket_server_client.submit( - "1", request_options={'requestId': socket_server_settings["SEC_WEBSOCKET_EXTENSIONS"]}).one()[0] - - assert 'permessage-deflate' in response - - # Tests that client is correctly sending all overridable per request settings (requestId, batchSize, # evaluationTimeout, and userAgent) to the server. [email protected](reason="not implemented in HTTP & need to check on server side") def test_should_send_per_request_settings_to_server(socket_server_client, socket_server_settings): result = socket_server_client.submit(
