Merge branch 'trunk' into py_webdriver_wait_custom_msg

Author: Delta456

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -50,7 +50,7 @@ body:
     id: selenium-version
     attributes:
       label: What version of Selenium are you currently using?
-      description: Important! The latest released version of Selenium is 4.32 and we can't fix old versions.
+      description: Important! The latest released version of Selenium is 4.33 and we can't fix old versions.
       placeholder: e.g., 4.17.0
     validations:
       required: true

.github/workflows/bazel.yml

@@ -122,7 +122,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
       - name: Setup Bazel with caching
         if: inputs.caching
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: bazel-contrib/setup-bazel@0.15.0
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
@@ -136,7 +136,7 @@ jobs:
           repository-cache: true
       - name: Setup Bazel without caching
         if: inputs.caching == false
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: bazel-contrib/setup-bazel@0.15.0
         with:
           bazelrc: common --color=yes
       - name: Setup curl for Ubuntu

.github/workflows/ci-python.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install tox==4.25.0
-      - name: Test with tox
+      - name: Generate docs
         run: tox -c py/tox.ini
         env:
           TOXENV: docs
@@ -48,10 +48,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install tox==4.25.0
-      - name: Test with tox
+      - name: Run type checking
         run: |
-          tox -c py/tox.ini -- --cobertura-xml-report ci || true
-          bash <(curl -s https://codecov.io/bash) -f py/ci/cobertura.xml
+          tox -c py/tox.ini || true
         env:
           TOXENV: mypy
 

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 50
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: bazel-contrib/setup-bazel@0.15.0
         with:
           bazelisk-cache: true
           cache-version: 2

.gitignore

@@ -75,6 +75,8 @@ py/selenium/webdriver/remote/getAttribute.js
 py/selenium/webdriver/remote/isDisplayed.js
 py/docs/build/
 py/docs/source/**/*
+!py/docs/source/conf.py
+!py/docs/source/*.rst
 py/build/
 py/LICENSE
 py/pytestdebug.log

AUTHORS

@@ -104,6 +104,7 @@ Ben Congleton <[email protected]>
 Ben Kucera <[email protected]>
 Ben Lamm <[email protected]>
 Ben Sedat <[email protected]>
+Benjamin <[email protected]>
 Benjamin Forehand Jr <[email protected]>
 Benoit Pierre <[email protected]>
 bgermann <[email protected]>
@@ -221,6 +222,7 @@ David Wang
 David Zhu <[email protected]>
 Debanjan Choudhury <[email protected]>
 deedy5 <[email protected]>
+DeflateAwning <[email protected]>
 Denis Demchenko <[email protected]>
 Dennis Oelkers <[email protected]>
 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@@ -863,6 +865,7 @@ Tobias Lidskog <[email protected]>
 Tobias Smolka <[email protected]>
 Toda Hiroshi <[email protected]>
 Toilal <[email protected]>
+Tom Hughes <[email protected]>
 Tom Longhurst <[email protected]>
 Tom Trumper <[email protected]>
 tomaszn <[email protected]>

MODULE.bazel

@@ -1,7 +1,6 @@
 module(name = "selenium")
 
 bazel_dep(name = "apple_rules_lint", version = "0.4.0")
-bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
 bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
 bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
 bazel_dep(name = "aspect_rules_js", version = "2.3.7")
@@ -21,6 +20,7 @@ bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
 bazel_dep(name = "rules_dotnet", version = "0.17.5")
 bazel_dep(name = "rules_java", version = "8.7.1")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_multitool", version = "1.3.0")
 bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.8.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
@@ -37,6 +37,10 @@ git_override(
     remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
 )
 
+multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
+multitool.hub(lockfile = "//:multitool.lock.json")
+use_repo(multitool, "multitool")
+
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
 linter.configure(
     name = "java-spotbugs",
@@ -180,7 +184,7 @@ maven.install(
         "com.google.auto:auto-common:1.2.2",
         "com.google.auto.service:auto-service:1.1.1",
         "com.google.auto.service:auto-service-annotations:1.1.1",
-        "com.google.googlejavaformat:google-java-format:1.26.0",
+        "com.google.googlejavaformat:google-java-format:1.27.0",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.72.0",
@@ -203,7 +207,7 @@ maven.install(
         "io.opentelemetry:opentelemetry-sdk-trace",
         "it.ozimov:embedded-redis:0.7.3",
         "net.bytebuddy:byte-buddy:1.17.5",
-        "org.htmlunit:htmlunit-core-js:4.11.0",
+        "org.htmlunit:htmlunit-core-js:4.12.0",
         "org.apache.commons:commons-exec:1.4.0",
         "org.apache.logging.log4j:log4j-core:2.24.3",
         "org.assertj:assertj-core:3.27.3",
@@ -218,15 +222,15 @@ maven.install(
         "org.junit.platform:junit-platform-reporting",
         "org.junit.platform:junit-platform-commons",
         "org.junit.platform:junit-platform-engine",
-        "org.mockito:mockito-core:5.17.0",
-        "org.redisson:redisson:3.46.0",
+        "org.mockito:mockito-core:5.18.0",
+        "org.redisson:redisson:3.47.0",
         "org.slf4j:slf4j-api:2.0.17",
         "org.slf4j:slf4j-jdk14:2.0.17",
         "org.tomlj:tomlj:1.1.1",
         "org.zeromq:jeromq:0.6.0",
     ],
     boms = [
-        "io.opentelemetry:opentelemetry-bom:1.49.0",
+        "io.opentelemetry:opentelemetry-bom:1.50.0",
         "io.netty:netty-bom:4.1.121.Final",
         "org.junit:junit-bom:5.12.2",
     ],
@@ -366,13 +370,17 @@ use_repo(
 pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension")
 use_repo(
     pin_browsers_extension,
+    "linux_beta_chrome",
+    "linux_beta_chromedriver",
     "linux_beta_firefox",
     "linux_chrome",
     "linux_chromedriver",
     "linux_edge",
     "linux_edgedriver",
     "linux_firefox",
     "linux_geckodriver",
+    "mac_beta_chrome",
+    "mac_beta_chromedriver",
     "mac_beta_firefox",
     "mac_chrome",
     "mac_chromedriver",

Rakefile

@@ -96,7 +96,7 @@ task '//java/test/org/openqa/selenium/environment/webserver:webserver:uber' => [
 JAVA_RELEASE_TARGETS = %w[
   //java/src/org/openqa/selenium/chrome:chrome.publish
   //java/src/org/openqa/selenium/chromium:chromium.publish
-  //java/src/org/openqa/selenium/devtools/v134:v134.publish
+  //java/src/org/openqa/selenium/devtools/v137:v137.publish
   //java/src/org/openqa/selenium/devtools/v135:v135.publish
   //java/src/org/openqa/selenium/devtools/v136:v136.publish
   //java/src/org/openqa/selenium/edge:edge.publish
@@ -1105,7 +1105,7 @@ namespace :all do
 
     ['common/devtools/',
      'dotnet/src/webdriver/DevTools/',
-     'dotnet/src/webdriver/WebDriver.csproj',
+     'dotnet/src/webdriver/Selenium.WebDriver.csproj',
      'dotnet/test/common/DevTools/',
      'dotnet/test/common/CustomDriverConfigs/',
      'dotnet/selenium-dotnet-version.bzl',

common/browsers.bzl

@@ -83,3 +83,25 @@ firefox_beta_data = select({
     ],
     "//conditions:default": [],
 }) + geckodriver_data
+
+chromedriver_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
+    "//conditions:default": [],
+})
+
+chrome_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chrome//:files",
+        "@linux_beta_chrome//:chrome-linux64/chrome",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chrome//:Chrome.app",
+    ],
+    "//conditions:default": [],
+}) + chromedriver_beta_data