Skip to content

Commit 44f6e99

Browse files
authored
Merge branch 'trunk' into download_end
2 parents 1be7708 + 5609fbc commit 44f6e99

File tree

350 files changed

+13448
-11772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+13448
-11772
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ test --test_env=FIREFOX_NIGHTLY_BINARY
8787
test --test_env=GITHUB_ACTIONS
8888
test --test_env=MOZ_HEADLESS
8989
test --test_env=SELENIUM_BROWSER
90-
test --test_env=TRAVIS
9190
test --test_env=PYTHON_VERSION
9291
test --test_env=SE_AVOID_STATS=true
9392

.bazelrc.remote

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ build:rbe --disk_cache=
3131
build:rbe --incompatible_enable_cc_toolchain_resolution
3232
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3333
test:rbe --test_env=DISPLAY=:99.0
34-
test:rbe --test_tag_filters=-skip-rbe,-remote
34+
test:rbe --test_tag_filters=-skip-rbe
3535

3636
# Env vars we can hard code
3737
build:rbe --action_env=HOME=/home/dev

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
id: selenium-version
5151
attributes:
5252
label: What version of Selenium are you currently using?
53-
description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.37 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/workflows/bazel.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ on:
5151
required: false
5252
type: string
5353
default: ''
54+
python-version:
55+
description: Custom Python version to use
56+
required: false
57+
type: string
58+
default: ''
5459
ruby-version:
5560
description: Custom Ruby version to use
5661
required: false
@@ -101,6 +106,9 @@ jobs:
101106
if: inputs.os != 'windows'
102107
run: |
103108
sudo rm -rf "$CHROMEWEBDRIVER" "$EDGEWEBDRIVER" "$GECKOWEBDRIVER"
109+
- name: Set Python version
110+
if: inputs.python-version != ''
111+
run: echo '${{ inputs.python-version }}' > py/.python-version
104112
- name: Set Ruby version
105113
if: inputs.ruby-version != ''
106114
run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
@@ -126,6 +134,8 @@ jobs:
126134
with:
127135
bazelisk-cache: true
128136
bazelrc: common --color=yes
137+
# Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
138+
output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
129139
cache-version: 2
130140
disk-cache: ${{ inputs.cache-key }}
131141
external-cache: |

.github/workflows/ci-python.yml

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,73 @@ jobs:
1111
with:
1212
name: Build
1313
cache-key: py-build
14-
run: bazel build //py:selenium-wheel //py:selenium-sdist
14+
run: |
15+
bazel build //py:selenium-wheel //py:selenium-sdist
1516
1617
docs:
1718
name: Documentation
18-
needs: build
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
23-
- name: Set up Python 3.9
23+
- name: Set up Python 3.10
2424
uses: actions/setup-python@v6
2525
with:
26-
python-version: 3.9
26+
python-version: '3.10'
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.30.2
30+
pip install tox
3131
- name: Generate docs
32-
run: tox -c py/tox.ini
32+
run: |
33+
tox -c py/tox.ini
3334
env:
3435
TOXENV: docs
3536

36-
mypy:
37-
name: Mypy
38-
needs: build
37+
typing:
38+
name: Type Checker
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
43-
- name: Set up Python 3.9
43+
- name: Set up Python 3.10
4444
uses: actions/setup-python@v6
4545
with:
46-
python-version: 3.9
46+
python-version: '3.10'
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.30.2
50+
pip install tox
5151
- name: Run type checking
5252
run: |
5353
tox -c py/tox.ini || true
5454
env:
5555
TOXENV: mypy
5656

57+
unit-tests:
58+
name: Unit Tests
59+
needs: build
60+
uses: ./.github/workflows/bazel.yml
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
include:
65+
- python-version: '3.10'
66+
os: ubuntu
67+
- python-version: '3.10'
68+
os: macos
69+
- python-version: '3.14'
70+
os: ubuntu
71+
- python-version: '3.14'
72+
os: macos
73+
with:
74+
name: Unit Tests (${{ matrix.python-version }}, ${{ matrix.os }})
75+
os: ${{ matrix.os }}
76+
python-version: ${{ matrix.python-version }}
77+
cache-key: python-unit-test-${{ matrix.python-version }}
78+
run: |
79+
bazel test //py:unit
80+
5781
remote-tests:
5882
name: Remote Tests
5983
needs: build
@@ -62,12 +86,13 @@ jobs:
6286
fail-fast: false
6387
matrix:
6488
include:
65-
- browser: firefox
89+
- browser: chrome
6690
with:
6791
name: Integration Tests (remote, ${{ matrix.browser }})
6892
browser: ${{ matrix.browser }}
6993
cache-key: py-remote-${{ matrix.browser }}
70-
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
94+
run: |
95+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
7196
7297
browser-tests:
7398
name: Browser Tests
@@ -89,10 +114,30 @@ jobs:
89114
os: ${{ matrix.os }}
90115
cache-key: py-browser-${{ matrix.browser }}
91116
run: |
92-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
93-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
117+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
118+
119+
browser-tests-windows:
120+
name: Browser Tests
121+
needs: build
122+
uses: ./.github/workflows/bazel.yml
123+
strategy:
124+
fail-fast: false
125+
matrix:
126+
include:
127+
- browser: chrome
128+
os: windows
129+
- browser: edge
130+
os: windows
131+
with:
132+
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
133+
browser: ${{ matrix.browser }}
134+
os: ${{ matrix.os }}
135+
cache-key: py-browser-${{ matrix.browser }}
136+
run: |
137+
fsutil 8dot3name set 0
138+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
94139
95-
safari-tests:
140+
browser-tests-macos:
96141
name: Browser Tests
97142
needs: build
98143
uses: ./.github/workflows/bazel.yml
@@ -108,4 +153,4 @@ jobs:
108153
os: ${{ matrix.os }}
109154
cache-key: py-browser-${{ matrix.browser }}
110155
run: |
111-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
156+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}

.github/workflows/update-documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ jobs:
6666
with:
6767
java-version: 17
6868
distribution: 'temurin'
69-
- name: Set up Python 3.9
69+
- name: Set up Python 3.10
7070
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
7171
uses: actions/setup-python@v6
7272
with:
73-
python-version: 3.9
73+
python-version: '3.10'
7474
- name: Install dependencies
7575
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
7676
run: |

.skipped-tests

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,12 @@
2727
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
2828
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
2929
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
30-
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3130
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
3231
-//rb/spec/integration/selenium/webdriver/edge:service-edge
33-
-//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
3432
-//rb/spec/integration/selenium/webdriver/edge:service-edge-remote
35-
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi
3633
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
3734
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
38-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
3935
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-remote
40-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
4136
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-remote
4237
-//rb/spec/integration/selenium/webdriver/remote:driver-chrome-remote
4338
-//rb/spec/integration/selenium/webdriver/remote:driver-edge-remote
@@ -49,6 +44,5 @@
4944
-//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote
5045
-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
5146
-//rb/spec/integration/selenium/webdriver:element-chrome
52-
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
5347
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
5448
-//rb:lint

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ Matthew Kempkers <[email protected]>
601601
Matthew Lymer <[email protected]>
602602
Matthew Rahtz <[email protected]>
603603
matthewdoerksen <[email protected]>
604+
Matthias Kurz <[email protected]>
604605
605606
Max Perrello <[email protected]>
606607
Max Schmitt <[email protected]>
@@ -683,6 +684,7 @@ nir-tal-talkspace <[email protected]>
683684
Nirantak Raghav <[email protected]>
684685
685686
Noel Gordon
687+
Noel Kim (김민혁) <[email protected]>
686688
Noritaka Kobayashi <[email protected]>
687689
NoStory-py <[email protected]>
688690
Nowell Strite <[email protected]>

MODULE.bazel

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bazel_dep(name = "rules_multitool", version = "1.3.0")
2424
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2525
bazel_dep(name = "rules_oci", version = "1.8.0")
2626
bazel_dep(name = "rules_pkg", version = "1.0.1")
27-
bazel_dep(name = "rules_python", version = "1.5.0")
27+
bazel_dep(name = "rules_python", version = "1.6.3")
2828
bazel_dep(name = "rules_proto", version = "7.0.2")
2929
bazel_dep(name = "rules_ruby", version = "0.19.0")
3030

@@ -123,12 +123,12 @@ use_repo(oci, "chrome_standalone", "firefox_standalone", "java_image_base")
123123
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
124124
python.toolchain(
125125
is_default = True,
126-
python_version = "3.9",
126+
python_version = "3.10",
127127
)
128-
python.toolchain(python_version = "3.10")
129128
python.toolchain(python_version = "3.11")
130129
python.toolchain(python_version = "3.12")
131130
python.toolchain(python_version = "3.13")
131+
python.toolchain(python_version = "3.14")
132132
use_repo(python, "pythons_hub")
133133

134134
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -140,11 +140,11 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
140140
requirements_lock = "//py:requirements_lock.txt",
141141
)
142142
for version in [
143-
"3.9",
144143
"3.10",
145144
"3.11",
146145
"3.12",
147146
"3.13",
147+
"3.14",
148148
]
149149
]
150150

@@ -173,8 +173,9 @@ maven.install(
173173
name = "maven",
174174
artifacts = [
175175
"com.beust:jcommander:1.82",
176-
"com.github.javaparser:javaparser-core:3.27.0",
177-
"com.github.spotbugs:spotbugs:4.9.6",
176+
"org.checkerframework:checker-qual:3.51.1",
177+
"com.github.javaparser:javaparser-core:3.27.1",
178+
"com.github.spotbugs:spotbugs:4.9.7",
178179
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
179180
"com.google.code.findbugs:jsr305:3.0.2",
180181
"com.google.code.gson:gson:2.13.2",
@@ -183,12 +184,13 @@ maven.install(
183184
"com.google.auto:auto-common:1.2.2",
184185
"com.google.auto.service:auto-service:1.1.1",
185186
"com.google.auto.service:auto-service-annotations:1.1.1",
186-
"com.google.googlejavaformat:google-java-format:1.28.0",
187-
"com.google.protobuf:protobuf-java:4.32.1",
187+
"com.google.googlejavaformat:google-java-format:1.30.0",
188+
"com.google.protobuf:protobuf-java:4.33.0",
188189
"com.google.protobuf.nano:protobuf-javanano:3.1.0",
189190
"com.graphql-java:graphql-java:24.1",
191+
"com.uber.nullaway:nullaway:0.12.10",
190192
"dev.failsafe:failsafe:3.3.2",
191-
"io.grpc:grpc-context:1.75.0",
193+
"io.grpc:grpc-context:1.76.0",
192194
"io.lettuce:lettuce-core:6.8.1.RELEASE",
193195
"io.netty:netty-buffer",
194196
"io.netty:netty-codec-http",
@@ -207,11 +209,11 @@ maven.install(
207209
"io.opentelemetry:opentelemetry-sdk-testing",
208210
"io.opentelemetry:opentelemetry-sdk-trace",
209211
"it.ozimov:embedded-redis:0.7.3",
210-
"net.bytebuddy:byte-buddy:1.17.7",
211-
"org.htmlunit:htmlunit-core-js:4.16.0",
212+
"net.bytebuddy:byte-buddy:1.17.8",
213+
"org.htmlunit:htmlunit-core-js:4.17.0",
212214
"org.apache.commons:commons-exec:1.5.0",
213-
"org.apache.logging.log4j:log4j-core:2.25.1",
214-
"org.assertj:assertj-core:3.27.4",
215+
"org.apache.logging.log4j:log4j-core:2.25.2",
216+
"org.assertj:assertj-core:3.27.6",
215217
"org.bouncycastle:bcpkix-jdk18on:1.82",
216218
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
217219
"org.hsqldb:hsqldb:2.7.4",
@@ -224,8 +226,8 @@ maven.install(
224226
"org.junit.platform:junit-platform-reporting",
225227
"org.junit.platform:junit-platform-commons",
226228
"org.junit.platform:junit-platform-engine",
227-
"org.mockito:mockito-core:5.19.0",
228-
"org.redisson:redisson:3.51.0",
229+
"org.mockito:mockito-core:5.20.0",
230+
"org.redisson:redisson:3.52.0",
229231
"org.slf4j:slf4j-api:2.0.17",
230232
"org.slf4j:slf4j-jdk14:2.0.17",
231233
"org.tomlj:tomlj:1.1.1",
@@ -234,9 +236,9 @@ maven.install(
234236
"uk.org.webcompere:system-stubs-core:2.1.8",
235237
],
236238
boms = [
237-
"io.opentelemetry:opentelemetry-bom:1.54.0",
238-
"io.netty:netty-bom:4.2.6.Final",
239-
"org.junit:junit-bom:5.13.4",
239+
"io.opentelemetry:opentelemetry-bom:1.55.0",
240+
"io.netty:netty-bom:4.2.7.Final",
241+
"org.junit:junit-bom:6.0.0",
240242
],
241243
excluded_artifacts = [
242244
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
@@ -305,8 +307,8 @@ ruby.bundle_fetch(
305307
"io-console-0.8.1-java": "9457a61a7b23aab11e9e9ff67f71ae81d7f1a6a2e582bb5d65d754cbb546c06f",
306308
"irb-1.15.2": "222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba",
307309
"jar-dependencies-0.5.5": "2972b9fcba4b014e6446a84b5c09674a3e8648b95b71768e729f0e8e40568059",
308-
"json-2.13.2": "02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68",
309-
"json-2.13.2-java": "2e1292c45598a3642216820a821cba89c623f99387b8cb90adb345878f4e5c7d",
310+
"json-2.15.1": "b1c1b2e7c116eb1903e0ce0c374783e6ead8747a0f9eca132d274018ebb80b89",
311+
"json-2.15.1-java": "a6185eebe724a6937f60729e4998276d6b3de3ecc35be34f8e47c1eb40903ecf",
310312
"language_server-protocol-3.17.0.5": "fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc",
311313
"lint_roller-1.1.0": "2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87",
312314
"listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67",
@@ -316,7 +318,7 @@ ruby.bundle_fetch(
316318
"parser-3.3.9.0": "94d6929354b1a6e3e1f89d79d4d302cc8f5aa814431a6c9c7e0623335d7687f2",
317319
"pp-0.6.2": "947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff",
318320
"prettyprint-0.2.0": "2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193",
319-
"prism-1.4.0": "dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e",
321+
"prism-1.6.0": "bfc0281a81718c4872346bc858dc84abd3a60cae78336c65ad35c8fbff641c6b",
320322
"psych-5.2.6": "814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e",
321323
"psych-5.2.6-java": "0a5f65d47ed1ae3475d062b254e7b2035a259eac578038016d62172dd4cfbd91",
322324
"public_suffix-6.0.2": "bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394",

0 commit comments

Comments
 (0)