Merge branch 'trunk' into disable-edge-test

Author: navin772

.github/workflows/ci-python.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.25.0
+          pip install tox==4.27.0
       - name: Generate docs
         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.25.0
+          pip install tox==4.27.0
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs

@@ -147,6 +147,16 @@ public Task<Subscription> OnFragmentNavigatedAsync(Action<NavigationInfo> handle
         return BiDi.BrowsingContext.OnFragmentNavigatedAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [this] });
     }
 
+    public Task<Subscription> OnHistoryUpdatedAsync(Func<HistoryUpdatedEventArgs, Task> handler, SubscriptionOptions? options = null)
+    {
+        return BiDi.BrowsingContext.OnHistoryUpdatedAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [this] });
+    }
+
+    public Task<Subscription> OnHistoryUpdatedAsync(Action<HistoryUpdatedEventArgs> handler, SubscriptionOptions? options = null)
+    {
+        return BiDi.BrowsingContext.OnHistoryUpdatedAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [this] });
+    }
+
     public Task<Subscription> OnDomContentLoadedAsync(Func<NavigationInfo, Task> handler, SubscriptionOptions? options = null)
     {
         return BiDi.BrowsingContext.OnDomContentLoadedAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [this] });

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs

@@ -134,6 +134,16 @@ public async Task<Subscription> OnFragmentNavigatedAsync(Action<NavigationInfo>
         return await Broker.SubscribeAsync("browsingContext.fragmentNavigated", handler, options).ConfigureAwait(false);
     }
 
+    public async Task<Subscription> OnHistoryUpdatedAsync(Func<HistoryUpdatedEventArgs, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
+    {
+        return await Broker.SubscribeAsync("browsingContext.historyUpdated", handler, options).ConfigureAwait(false);
+    }
+
+    public async Task<Subscription> OnHistoryUpdatedAsync(Action<HistoryUpdatedEventArgs> handler, BrowsingContextsSubscriptionOptions? options = null)
+    {
+        return await Broker.SubscribeAsync("browsingContext.historyUpdated", handler, options).ConfigureAwait(false);
+    }
+
     public async Task<Subscription> OnDomContentLoadedAsync(Func<NavigationInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
     {
         return await Broker.SubscribeAsync("browsingContext.domContentLoaded", handler, options).ConfigureAwait(false);

dotnet/src/webdriver/BiDi/BrowsingContext/HistoryUpdatedEventArgs.cs

@@ -0,0 +1,25 @@
+// <copyright file="HistoryUpdatedEventArgs.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+
+namespace OpenQA.Selenium.BiDi.BrowsingContext;
+
+public record HistoryUpdatedEventArgs(BiDi BiDi, BrowsingContext Context, DateTimeOffset Timestamp, string Url)
+    : BrowsingContextEventArgs(BiDi, Context);

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -111,9 +111,10 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(BrowsingContext.SetViewportCommand))]
 [JsonSerializable(typeof(BrowsingContext.TraverseHistoryCommand))]
 [JsonSerializable(typeof(BrowsingContext.TraverseHistoryResult))]
+
 [JsonSerializable(typeof(BrowsingContext.BrowsingContextInfo))]
+[JsonSerializable(typeof(BrowsingContext.HistoryUpdatedEventArgs))]
 [JsonSerializable(typeof(BrowsingContext.NavigationInfo))]
-
 [JsonSerializable(typeof(BrowsingContext.UserPromptOpenedEventArgs))]
 [JsonSerializable(typeof(BrowsingContext.UserPromptClosedEventArgs))]
 

dotnet/src/webdriver/BiDi/Session/ProxyConfiguration.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Session;
@@ -33,19 +34,26 @@ public record AutoDetectProxyConfiguration : ProxyConfiguration;
 
 public record DirectProxyConfiguration : ProxyConfiguration;
 
-public record ManualProxyConfiguration : ProxyConfiguration
+public record ManualProxyConfiguration : ProxyConfiguration, ISocksProxyConfiguration
 {
-    public string? FtpProxy { get; set; }
-
     public string? HttpProxy { get; set; }
 
     public string? SslProxy { get; set; }
 
     public string? SocksProxy { get; set; }
 
-    public long? SocksVersion { get; set; }
+    public int? SocksVersion { get; set; }
+
+    public IEnumerable<string>? NoProxy { get; set; }
 }
 
 public record PacProxyConfiguration(string ProxyAutoConfigUrl) : ProxyConfiguration;
 
 public record SystemProxyConfiguration : ProxyConfiguration;
+
+public interface ISocksProxyConfiguration
+{
+    public string? SocksProxy { get; set; }
+
+    public int? SocksVersion { get; set; } // 0..255
+}

py/docs/source/index.rst

@@ -23,7 +23,7 @@ The `selenium` package is used to automate web browser interaction from Python.
 | **API Docs**:     | `api.html <api.html>`_                         |
 +-------------------+------------------------------------------------+
 
-Updated documentation published with each commit is available at: https://selenium-python-api-docs.readthedocs.io
+Updated documentation published with each commit is available at: `readthedocs.io <https://selenium-python-api-docs.readthedocs.io/en/latest>`_
 
 ----
 

py/generate_api_module_listing.py

@@ -15,13 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# -----------------------------------------------------------------
-# This script recursively scans the `selenium` package directory
-# to find all modules, then generates the `py/docs/source/api.rst`
-# file containing a listing of all modules in separate sections.
-# The `api.rst` file is later used by `sphinx-autogen` to generate
-# sphinx autodoc stub pages used in the Python API documentation.
-# See `py/tox.ini` for how it is invoked.
+
+"""This script recursively scans the `selenium` package directory
+to find all modules, then generates the `py/docs/source/api.rst`
+file containing a listing of all modules in separate sections.
+The `api.rst` file is later used by `sphinx-autogen` to generate
+sphinx autodoc stub pages used in the Python API documentation.
+See `py/tox.ini` for how it is invoked."""
 
 import os
 import site
@@ -47,8 +47,8 @@ def find_modules(package_name):
     package_name = "selenium"
     output_file = os.path.join("docs", "source", "api.rst")
     print(f"generating module list for sphinx autodoc in: {output_file}\n")
-    modules = find_modules(package_name)
-    base_modules = [mod for mod in sorted(set(module.rsplit(".", 1)[0] for module in modules)) if mod != package_name]
+    modules = [module for module in find_modules(package_name) if ".devtools." not in module]
+    base_modules = [mod for mod in sorted({module.rsplit(".", 1)[0] for module in modules}) if mod != package_name]
     print("found sections:")
     for base_module in base_modules:
         print(f"    {base_module}")

py/pyproject.toml

@@ -25,10 +25,10 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     ]
 dependencies = [
-    "urllib3[socks]~=2.4.0",
+    "urllib3[socks]~=2.5.0",
     "trio~=0.30.0",
     "trio-websocket~=0.12.2",
-    "certifi>=2025.4.26",
+    "certifi>=2025.6.15",
     "typing_extensions~=4.14.0",
     "websocket-client~=1.8.0",
     ]

py/requirements.txt

@@ -1,12 +1,11 @@
-async-generator==1.10
 attrs==25.3.0
-cachetools==6.0.0
-certifi==2025.4.26
+cachetools==6.1.0
+certifi==2025.6.15
 cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.4.2
 colorama==0.4.6
-cryptography==45.0.3
+cryptography==45.0.4
 debugpy==1.8.14
 distlib==0.3.9
 docutils==0.21.2
@@ -26,7 +25,7 @@ keyring==25.6.0
 markdown-it-py==3.0.0
 mdurl==0.1.2
 more-itertools==10.7.0
-multidict==6.4.4
+multidict==6.5.0
 nh3==0.2.21
 outcome==1.3.0.post0
 packaging==25.0
@@ -35,30 +34,28 @@ pluggy==1.6.0
 py==1.11.0
 pycparser==2.22
 Pygments==2.19.1
-pyOpenSSL==25.1.0
-pyparsing==3.2.3
 pyproject-api==1.9.1
 PySocks==1.7.1
-pytest==8.4.0
+pytest==8.4.1
 pytest-instafail==0.5.0
 pytest-mock==3.14.1
 pytest-trio==0.8.0
+pywin32-ctypes==0.2.3
 readme_renderer==44.0
-requests==2.32.3
+requests==2.32.4
 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
-tox==4.26.0
+tox==4.27.0
 trio==0.30.0
 trio-websocket==0.12.2
 twine==6.1.0
 typing_extensions==4.14.0
-urllib3[socks]==2.4.0
+urllib3[socks]==2.5.0
 virtualenv==20.31.2
 websocket-client==1.8.0
 wsproto==1.2.0
-zipp==3.22.0
+zipp==3.23.0