Merge branch 'trunk' into fix-mypy-type-errors-2

Author: cgoldberg

py/BUILD.bazel

@@ -312,7 +312,7 @@ py_wheel(
         "trio~=0.30.0",
         "trio-websocket~=0.12.2",
         "certifi>=2025.4.26",
-        "typing_extensions~=4.13.2",
+        "typing_extensions~=4.14.0",
         "websocket-client~=1.8.0",
     ],
     strip_path_prefixes = [

py/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "trio~=0.30.0",
     "trio-websocket~=0.12.2",
     "certifi>=2025.4.26",
-    "typing_extensions~=4.13.2",
+    "typing_extensions~=4.14.0",
     "websocket-client~=1.8.0",
     ]
 

py/requirements.txt

@@ -1,12 +1,12 @@
 async-generator==1.10
 attrs==25.3.0
-cachetools==5.5.2
+cachetools==6.0.0
 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
+cryptography==45.0.3
 debugpy==1.8.14
 distlib==0.3.9
 docutils==0.21.2
@@ -26,22 +26,22 @@ keyring==25.6.0
 markdown-it-py==3.0.0
 mdurl==0.1.2
 more-itertools==10.7.0
-multidict==6.4.3
+multidict==6.4.4
 nh3==0.2.21
 outcome==1.3.0.post0
 packaging==25.0
 platformdirs==4.3.8
-pluggy==1.5.0
+pluggy==1.6.0
 py==1.11.0
 pycparser==2.22
 Pygments==2.19.1
-pyOpenSSL==25.0.0
+pyOpenSSL==25.1.0
 pyparsing==3.2.3
-pyproject-api==1.9.0
+pyproject-api==1.9.1
 PySocks==1.7.1
-pytest==8.3.5
+pytest==8.4.0
 pytest-instafail==0.5.0
-pytest-mock==3.14.0
+pytest-mock==3.14.1
 pytest-trio==0.8.0
 readme_renderer==44.0
 requests==2.32.3
@@ -52,13 +52,13 @@ SecretStorage==3.3.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
 toml==0.10.2
-tox==4.25.0
+tox==4.26.0
 trio==0.30.0
 trio-websocket==0.12.2
 twine==6.1.0
-typing_extensions==4.13.2
+typing_extensions==4.14.0
 urllib3[socks]==2.4.0
 virtualenv==20.31.2
 websocket-client==1.8.0
 wsproto==1.2.0
-zipp==3.21.0
+zipp==3.22.0

py/requirements_lock.txt

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Optional, Union
+from typing import Any, Optional, Union
 
 from selenium.webdriver.common.bidi.common import command_builder
 
@@ -85,12 +85,19 @@ def from_dict(cls, data: dict) -> "Cookie":
         -------
             Cookie: A new instance of Cookie.
         """
-        value = BytesValue(data.get("value", {}).get("type"), data.get("value", {}).get("value"))
+        # Validation for empty strings
+        name = data.get("name")
+        if not name:
+            raise ValueError("name is required and cannot be empty")
+        domain = data.get("domain")
+        if not domain:
+            raise ValueError("domain is required and cannot be empty")
 
+        value = BytesValue(data.get("value", {}).get("type"), data.get("value", {}).get("value"))
         return cls(
-            name=data.get("name"),
+            name=str(name),
             value=value,
-            domain=data.get("domain"),
+            domain=str(domain),
             path=data.get("path"),
             size=data.get("size"),
             http_only=data.get("httpOnly"),
@@ -125,14 +132,14 @@ def __init__(
         self.same_site = same_site
         self.expiry = expiry
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict[str, Any]:
         """Converts the CookieFilter to a dictionary.
 
         Returns:
         -------
             Dict: A dictionary representation of the CookieFilter.
         """
-        result = {}
+        result: dict[str, Any] = {}
         if self.name is not None:
             result["name"] = self.name
         if self.value is not None:
@@ -242,14 +249,14 @@ def __init__(
         self.same_site = same_site
         self.expiry = expiry
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict[str, Any]:
         """Converts the PartialCookie to a dictionary.
 
         Returns:
         -------
             Dict: A dictionary representation of the PartialCookie.
         """
-        result = {
+        result: dict[str, Any] = {
             "name": self.name,
             "value": self.value.to_dict(),
             "domain": self.domain,

py/selenium/webdriver/common/bidi/storage.py

@@ -422,7 +422,7 @@ def __init__(self) -> None:
         self._caps = self.default_capabilities
         self._proxy = None
         self.set_capability("pageLoadStrategy", PageLoadStrategy.normal)
-        self.mobile_options = None
+        self.mobile_options: Optional[dict[str, str]] = None
         self._ignore_local_proxy = False
 
     @property

py/selenium/webdriver/common/options.py

@@ -24,17 +24,17 @@
 class Protocol(str, Enum):
     """Protocol to communicate with the authenticator."""
 
-    CTAP2: str = "ctap2"
-    U2F: str = "ctap1/u2f"
+    CTAP2 = "ctap2"
+    U2F = "ctap1/u2f"
 
 
 class Transport(str, Enum):
     """Transport method to communicate with the authenticator."""
 
-    BLE: str = "ble"
-    USB: str = "usb"
-    NFC: str = "nfc"
-    INTERNAL: str = "internal"
+    BLE = "ble"
+    USB = "usb"
+    NFC = "nfc"
+    INTERNAL = "internal"
 
 
 class VirtualAuthenticatorOptions:

py/selenium/webdriver/common/virtual_authenticator.py

@@ -32,9 +32,9 @@ setenv =
 [testenv:mypy]
 skip_install = true
 deps =
-    mypy==1.15.0
-    lxml==5.3.2
-    types-urllib3==1.26.25
+    mypy==1.16.0
+    lxml==5.4.0
+    types-urllib3==1.26.25.14
     types-certifi==2021.10.8.3
     trio-typing==0.10.0
 commands =

py/tox.ini

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+#
+# This script updates the development dependendencies used for the Python bindings.
+#
+# When you run it, it will:
+# - create and activate a temporary virtual env
+# - install the current package dependencies from `py/requirements.txt`
+# - upgrade the package dependencies to the latest versions available on PyPI
+# - run `pip freeze` to generate a new `py/requirements.txt` file
+# - run `bazel run //py:requirements.update` to generate a new `py/requirements_lock.txt` file
+# - deactivate and remove the temporary virtual env
+#
+# After running this script, you should also manually check package dependency versions in
+# `py/pyproject.toml`, `py/tox.ini` and `py/BUILD.bazel`, and update those if needed.
+#
+# Once all dependencies are updated, create a new Pull Request with the changes.
+
+set -e
+
+REQUIREMENTS_FILE="./py/requirements.txt"
+VENV="./temp_virtualenv"
+
+cd "$(git rev-parse --show-toplevel)"
+
+if [[ ! -f "${REQUIREMENTS_FILE}" ]]; then
+    echo "can't find: ${REQUIREMENTS_FILE}"
+    exit 1
+fi
+
+if [[ -d "${VENV}" ]]; then
+    echo "${VENV} already exists"
+    exit 1
+fi
+
+echo "creating virtual env: ${VENV}"
+python3 -m venv "${VENV}"
+
+echo "activating virtual env"
+source "${VENV}/bin/activate"
+
+echo "upgrading pip"
+python -m pip install --upgrade pip > /dev/null
+
+echo "installing dev dependencies from: ${REQUIREMENTS_FILE}"
+pip install -r "${REQUIREMENTS_FILE}" > /dev/null
+
+echo "upgrading outdated dependencies ..."
+echo
+pip list --outdated | while read -r line; do
+    if [[ ! "${line}" =~ "Version Latest" && ! "${line}" =~ "----" ]]; then
+        read -ra fields <<< "${line}"
+        package="${fields[0]}"
+        echo "upgrading ${package} from ${fields[1]} to ${fields[2]}"
+        pip install --upgrade "${package}==${fields[2]}" > /dev/null
+    fi
+done
+
+echo
+echo "generating new ${REQUIREMENTS_FILE}"
+pip freeze > "${REQUIREMENTS_FILE}"
+# `pip freeze` doesn't show package "extras", so we explicitly add it here for urllib3
+if [[ "${OSTYPE}" == "linux"* ]]; then
+    sed -i "s/urllib3/urllib3[socks]/g" "${REQUIREMENTS_FILE}" # GNU sed
+else
+    sed -i "" "s/urllib3/urllib3[socks]/g" "${REQUIREMENTS_FILE}"
+fi
+
+echo "generating new lock file"
+bazel run //py:requirements.update
+
+echo
+echo "deleting virtual env: ${VENV}"
+deactivate
+rm -rf "${VENV}"
+
+echo
+git status
+
+echo
+echo "done!"