Merge branch 'SeleniumHQ:trunk' into py-ruff

Author: cgoldberg

.github/workflows/ci-python.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: tox -c py/tox.ini
         env:
@@ -47,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: tox -c py/tox.ini
         env:
@@ -69,7 +69,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: |
           tox -c py/tox.ini -- --cobertura-xml-report ci || true

README.md

@@ -231,8 +231,6 @@ To run all of the linting tools:
 ./go py:lint
 ```
 
-You need `tox` installed to run the linting tools (`pip install tox`).
-
 #### Local Installation
 
 To run Python code locally without building/installing the package, you must first install the dependencies:

py/BUILD.bazel

@@ -78,7 +78,7 @@ TEST_DEPS = [
     requirement("iniconfig"),
     requirement("importlib_metadata"),
     requirement("h11"),
-    requirement("more_itertools"),
+    requirement("more-itertools"),
     requirement("multidict"),
     requirement("outcome"),
     requirement("pluggy"),
@@ -198,7 +198,7 @@ py_library(
     deps = [
         requirement("urllib3"),
         requirement("trio"),
-        requirement("trio_websocket"),
+        requirement("trio-websocket"),
         requirement("certifi"),
         requirement("typing_extensions"),
         requirement("websocket-client"),
@@ -269,7 +269,6 @@ py_wheel(
     classifiers = [
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: MacOS :: MacOS X",
@@ -289,12 +288,12 @@ py_wheel(
     python_requires = ">=3.9",
     python_tag = "py3",
     requires = [
-        "urllib3[socks]>=1.26,<3",
-        "trio~=0.17",
-        "trio-websocket~=0.9",
-        "certifi>=2021.10.8",
-        "typing_extensions~=4.9",
-        "websocket-client~=1.8",
+        "urllib3[socks]~=2.4.0",
+        "trio~=0.30.0",
+        "trio-websocket~=0.12.2",
+        "certifi>=2025.4.26",
+        "typing_extensions~=4.13.2",
+        "websocket-client~=1.8.0",
     ],
     strip_path_prefixes = [
         "py/",

py/conftest.py

@@ -17,6 +17,7 @@
 
 import os
 import platform
+from pathlib import Path
 
 import pytest
 
@@ -84,13 +85,12 @@ def pytest_addoption(parser):
     )
 
 
-def pytest_ignore_collect(path, config):
+def pytest_ignore_collect(collection_path, config):
     drivers_opt = config.getoption("drivers")
     _drivers = set(drivers).difference(drivers_opt or drivers)
     if drivers_opt:
         _drivers.add("unit")
-    parts = path.dirname.split(os.path.sep)
-    return len([d for d in _drivers if d.lower() in parts]) > 0
+    return len([d for d in _drivers if d.lower() in collection_path.parts]) > 0
 
 
 def pytest_generate_tests(metafunc):
@@ -298,7 +298,7 @@ def server(request):
         # under Wayland, so we use XWayland instead.
         remote_env["MOZ_ENABLE_WAYLAND"] = "0"
 
-    if os.path.exists(jar_path):
+    if Path(jar_path).exists():
         # use the grid server built by bazel
         server = Server(path=jar_path, env=remote_env)
     else:

py/pyproject.toml

@@ -12,7 +12,6 @@ requires-python = "~=3.9"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: POSIX",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS :: MacOS X",
@@ -26,12 +25,12 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     ]
 dependencies = [
-    "urllib3[socks]>=1.26,<3",
-    "trio~=0.17",
-    "trio-websocket~=0.9",
-    "certifi>=2021.10.8",
-    "typing_extensions~=4.9",
-    "websocket-client~=1.8",
+    "urllib3[socks]~=2.4.0",
+    "trio~=0.30.0",
+    "trio-websocket~=0.12.2",
+    "certifi>=2025.4.26",
+    "typing_extensions~=4.13.2",
+    "websocket-client~=1.8.0",
     ]
 
 [project.urls]

py/requirements.txt

@@ -1,38 +1,64 @@
 async-generator==1.10
-attrs==23.2.0
-certifi==2023.11.17
-cffi==1.16.0
-cryptography==42.0.8
-secretstorage==3.3.3
-debugpy==1.8.11
+attrs==25.3.0
+cachetools==5.5.2
+certifi==2025.4.26
+cffi==1.17.1
+chardet==5.2.0
+charset-normalizer==3.4.2
+colorama==0.4.6
+cryptography==44.0.3
+debugpy==1.8.14
+distlib==0.3.9
+docutils==0.21.2
+filelock==3.18.0
 filetype==1.2.0
-h11==0.14.0
+h11==0.16.0
+id==1.5.0
 idna==3.10
-importlib-metadata==6.8.0
+importlib_metadata==8.7.0
 inflection==0.5.1
-iniconfig==2.0.0
-more-itertools==10.1.0
-multidict==6.0.5
+iniconfig==2.1.0
+jaraco.classes==3.4.0
+jaraco.context==6.0.1
+jaraco.functools==4.1.0
+jeepney==0.9.0
+keyring==25.6.0
+markdown-it-py==3.0.0
+mdurl==0.1.2
+more-itertools==10.7.0
+multidict==6.4.3
+nh3==0.2.21
 outcome==1.3.0.post0
-packaging==23.2
-pluggy==1.3.0
+packaging==25.0
+platformdirs==4.3.8
+pluggy==1.5.0
 py==1.11.0
-pycparser==2.21
-pyOpenSSL==22.0.0
-pyparsing==3.1.2
+pycparser==2.22
+Pygments==2.19.1
+pyOpenSSL==25.0.0
+pyparsing==3.2.3
+pyproject-api==1.9.0
 PySocks==1.7.1
-pytest==7.4.4
+pytest==8.3.5
 pytest-instafail==0.5.0
-pytest-mock==3.12.0
+pytest-mock==3.14.0
 pytest-trio==0.8.0
+readme_renderer==44.0
+requests==2.32.3
+requests-toolbelt==1.0.0
+rfc3986==2.0.0
+rich==14.0.0
+SecretStorage==3.3.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
 toml==0.10.2
-trio>=0.20.2
-trio-websocket==0.9.2
-twine==4.0.2
-typing_extensions==4.9.0
-urllib3[socks]==2.0.7
+tox==4.25.0
+trio==0.30.0
+trio-websocket==0.12.2
+twine==6.1.0
+typing_extensions==4.13.2
+urllib3[socks]==2.4.0
+virtualenv==20.31.2
 websocket-client==1.8.0
 wsproto==1.2.0
-zipp==3.17.0
+zipp==3.21.0