Skip to content

Commit f7764ff

Browse files
committed
merge trunk
2 parents b13ae71 + 509c7f1 commit f7764ff

File tree

207 files changed

+3403
-13176
lines changed

Some content is hidden

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

207 files changed

+3403
-13176
lines changed

.bazelrc.remote

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

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

.github/workflows/ci-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
browser: ${{ matrix.browser }}
112112
cache-key: rb-remote-${{ matrix.browser }}-${{ matrix.os }}-test
113113
os: ${{ matrix.os }}
114-
java-version: 11
114+
java-version: 17
115115
run: >
116116
bazel test
117117
--keep_going

.github/workflows/pre-release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,19 @@ jobs:
9797
**Warning: Manually update the changelogs before merging**
9898
9999
This PR:
100-
* Updates Rust version for Selenium Manager release
101100
* Updates Pinned browser version to coincide with new CDP release
102101
* Adds support for new CDP version and removes old CDP version
103102
* Selenium Manager references the new Selenium Manager release
104103
* Updates Maven Dependencies
105104
* Adds new authors to authors file
106105
* Updates all versions for all bindings
107106
* Generates *rough* change logs for each bindings (please tidy them up before merging this)
107+
* Not all commits need to be in the change log — users do not need to see anything about building or testing Selenium
108+
* Remove references to updating versions including nightly
109+
* The code now outputs the complete body of the commit message; make sure the changelog message is complete and correct
108110
109-
- Auto-generated by [create-pull-request][1]
111+
- This PR was auto-generated by workflow run: [release-preparation][1]
110112
111-
[1]: https://github.com/peter-evans/create-pull-request
113+
[1]: https://github.com/SeleniumHQ/selenium/actions/runs/${{ github.run_id }}
112114
labels: C-build
113115
draft: true

AUTHORS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ abidema <[email protected]>
1111
Adam Dangoor <[email protected]>
1212
Adam Demuri <[email protected]>
1313
Adam Goucher <[email protected]>
14+
Adam Halbrock <[email protected]>
1415
Adam Smith <[email protected]>
1516
AdamPDotty <[email protected]>
1617
Adi Roiban <[email protected]>
@@ -282,6 +283,7 @@ EwaMarek <[email protected]>
282283
283284
Felipe Knorr Kuhn <[email protected]>
284285
Fenil Mehta <[email protected]>
286+
FloKNetcare <[email protected]>
285287
Florian Apolloner <[email protected]>
286288
Florian LOPES <[email protected]>
287289
Florian Mutter <[email protected]>
@@ -454,6 +456,7 @@ John J. Barton <[email protected]>
454456
John Pelly <[email protected]>
455457
456458
459+
Jolyon Pawlyn <[email protected]>
457460
458461
Jon Dufresne <[email protected]>
459462
Jon Spalding
@@ -685,6 +688,7 @@ orangeudav <[email protected]>
685688
Oscar Devora <[email protected]>
686689
687690
Paladin Wang <[email protected]>
691+
688692
Palmer Bandy <[email protected]>
689693
Pat Tullmann <[email protected]>
690694
Patrice Jaton <[email protected]>
@@ -744,6 +748,7 @@ Robert Fletcher <[email protected]>
744748
Roberto Rivera <[email protected]>
745749
Robin Stocker <[email protected]>
746750
Rod McNew <[email protected]>
751+
Romain Tartière <[email protected]>
747752
Roman Yurchak <[email protected]>
748753
Roman Yurchak <[email protected]>
749754
Roman Zoller <[email protected]>

MODULE.bazel

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -172,56 +172,56 @@ maven.install(
172172
artifacts = [
173173
"com.beust:jcommander:1.82",
174174
"com.github.javaparser:javaparser-core:3.26.3",
175-
"com.github.spotbugs:spotbugs:4.9.1",
175+
"com.github.spotbugs:spotbugs:4.9.3",
176176
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
177+
"com.google.code.findbugs:jsr305:3.0.2",
177178
"com.google.code.gson:gson:2.12.1",
178-
"com.google.guava:guava:33.4.0-jre",
179+
"com.google.guava:guava:33.4.5-jre",
179180
"com.google.auto:auto-common:1.2.2",
180181
"com.google.auto.service:auto-service:1.1.1",
181182
"com.google.auto.service:auto-service-annotations:1.1.1",
182-
"com.google.googlejavaformat:google-java-format:jar:1.25.2",
183+
"com.google.googlejavaformat:google-java-format:1.25.2",
183184
"com.graphql-java:graphql-java:22.3",
184185
"dev.failsafe:failsafe:3.3.2",
185-
"io.grpc:grpc-context:1.70.0",
186-
"io.lettuce:lettuce-core:6.5.4.RELEASE",
187-
"io.netty:netty-buffer",
188-
"io.netty:netty-codec-http",
189-
"io.netty:netty-codec-http2",
190-
"io.netty:netty-common",
191-
"io.netty:netty-handler",
192-
"io.netty:netty-handler-proxy",
193-
"io.netty:netty-transport",
194-
"io.opentelemetry:opentelemetry-api",
195-
"io.opentelemetry:opentelemetry-context",
196-
"io.opentelemetry:opentelemetry-exporter-logging",
197-
"io.opentelemetry:opentelemetry-sdk",
198-
"io.opentelemetry:opentelemetry-sdk-common",
199-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
200-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201-
"io.opentelemetry:opentelemetry-sdk-testing",
202-
"io.opentelemetry:opentelemetry-sdk-trace",
203-
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
186+
"io.grpc:grpc-context:1.71.0",
187+
"io.lettuce:lettuce-core:6.5.5.RELEASE",
188+
"io.netty:netty-buffer:4.1.119.Final",
189+
"io.netty:netty-codec-http:4.1.119.Final",
190+
"io.netty:netty-codec-http2:4.1.119.Final",
191+
"io.netty:netty-common:4.1.119.Final",
192+
"io.netty:netty-handler:4.1.119.Final",
193+
"io.netty:netty-handler-proxy:4.1.119.Final",
194+
"io.netty:netty-transport:4.1.119.Final",
195+
"io.opentelemetry:opentelemetry-api:1.48.0",
196+
"io.opentelemetry:opentelemetry-context:1.48.0",
197+
"io.opentelemetry:opentelemetry-exporter-logging:1.48.0",
198+
"io.opentelemetry:opentelemetry-sdk:1.48.0",
199+
"io.opentelemetry:opentelemetry-sdk-common:1.48.0",
200+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.48.0",
201+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.48.0",
202+
"io.opentelemetry:opentelemetry-sdk-testing:1.48.0",
203+
"io.opentelemetry:opentelemetry-sdk-trace:1.48.0",
204204
"it.ozimov:embedded-redis:0.7.3",
205-
"net.bytebuddy:byte-buddy:1.15.11",
206-
"org.htmlunit:htmlunit-core-js:4.7.0",
205+
"net.bytebuddy:byte-buddy:1.17.2",
206+
"org.htmlunit:htmlunit-core-js:4.10.0",
207207
"org.apache.commons:commons-exec:1.4.0",
208208
"org.apache.logging.log4j:log4j-core:2.24.3",
209-
"org.assertj:assertj-core:3.27.2",
210-
"org.bouncycastle:bcpkix-jdk18on:1.79",
209+
"org.assertj:assertj-core:3.27.3",
210+
"org.bouncycastle:bcpkix-jdk18on:1.80",
211211
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
212212
"org.hsqldb:hsqldb:2.7.4",
213213
"org.jspecify:jspecify:1.0.0",
214-
"org.junit.jupiter:junit-jupiter-api",
215-
"org.junit.jupiter:junit-jupiter-engine",
216-
"org.junit.jupiter:junit-jupiter-params",
217-
"org.junit.platform:junit-platform-launcher",
218-
"org.junit.platform:junit-platform-reporting",
219-
"org.junit.platform:junit-platform-commons",
220-
"org.junit.platform:junit-platform-engine",
221-
"org.mockito:mockito-core:5.15.2",
222-
"org.redisson:redisson:3.41.0",
223-
"org.slf4j:slf4j-api:2.0.16",
224-
"org.slf4j:slf4j-jdk14:2.0.16",
214+
"org.junit.jupiter:junit-jupiter-api:5.12.1",
215+
"org.junit.jupiter:junit-jupiter-engine:5.12.1",
216+
"org.junit.jupiter:junit-jupiter-params:5.12.1",
217+
"org.junit.platform:junit-platform-launcher:1.12.1",
218+
"org.junit.platform:junit-platform-reporting:1.12.1",
219+
"org.junit.platform:junit-platform-commons:1.12.1",
220+
"org.junit.platform:junit-platform-engine:1.12.1",
221+
"org.mockito:mockito-core:5.16.1",
222+
"org.redisson:redisson:3.45.1",
223+
"org.slf4j:slf4j-api:2.0.17",
224+
"org.slf4j:slf4j-jdk14:2.0.17",
225225
"org.tomlj:tomlj:1.1.1",
226226
"org.zeromq:jeromq:0.6.0",
227227
],

README.md

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ for Maven to use locally by deploying to your local maven repository (`~/.m2/rep
201201

202202
#### Updating Dependencies
203203

204-
Dependencies are defined in the file [maven_deps.bzl](https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl).
204+
Dependencies are defined in the file [MODULE.bazel](https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel).
205205
To automatically update and pin new dependencies, run:
206206

207207
```shell
@@ -210,16 +210,47 @@ To automatically update and pin new dependencies, run:
210210

211211
### Python
212212

213-
You can run Python code locally by updating generated files in the python directory using:
213+
#### Linting
214+
215+
We follow the [PEP8 Style Guide for Python Code](https://peps.python.org/pep-0008) (except we use a 120 character line length).
216+
This is checked and enforced with several linting tools, including
217+
[black](https://pypi.org/project/black),
218+
[docformatter](https://pypi.org/project/docformatter),
219+
[flake8](https://flake8.pycqa.org),
220+
and [isort](https://pycqa.github.io/isort).
221+
222+
To run all of the linting tools:
223+
```shell
224+
./go py:lint
225+
```
226+
227+
You need `tox` installed to run the linting tools (`pip install tox`).
228+
229+
#### Local Installation
230+
231+
To run Python code locally without building/installing the package, you must first install the dependencies:
232+
```shell
233+
pip install -r py/requirements.txt
234+
```
235+
236+
Then, build the generated files and copy them into your local source tree:
214237
```shell
215-
./go py:update
238+
./go py:local_dev
216239
```
217240

218-
To install Selenium locally based on a specific commit, you can use:
241+
After that, you can import the selenium package directly from source from the `py` directory.
242+
243+
Instead of running from source, you can build and install the selenium package (wheel) locally:
219244
```shell
220245
./go py:install
221246
```
222247

248+
This will attempt to install into the global Python `site-packages` directory,
249+
which might not be writable. To avoid this, you should create and activate a
250+
[virtual environment](https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments)
251+
before installing.
252+
253+
223254
### Ruby
224255

225256
Instead of using `irb`, you can create an interactive REPL with all gems loaded using: `bazel run //rb:console`
@@ -283,6 +314,9 @@ Tests can also be filtered by tag like:
283314
bazel test //<language>/... --test_tag_filters=this,-not-this
284315
```
285316

317+
If there are multiple `--test_tag_filters`, only the last one is considered,
318+
so be careful if also using an inherited config
319+
286320
### Java
287321

288322
<details>

0 commit comments

Comments
 (0)