Skip to content

Commit 3062d0e

Browse files
authored
Merge branch 'trunk' into rb_add_argument_for_websocket_port
2 parents f93a1f5 + c43af38 commit 3062d0e

File tree

14 files changed

+151
-118
lines changed

14 files changed

+151
-118
lines changed

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ maven.install(
176176
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
177177
"com.google.code.findbugs:jsr305:3.0.2",
178178
"com.google.code.gson:gson:2.12.1",
179-
"com.google.guava:guava:33.4.0-jre",
179+
"com.google.guava:guava:33.4.5-jre",
180180
"com.google.auto:auto-common:1.2.2",
181181
"com.google.auto.service:auto-service:1.1.1",
182182
"com.google.auto.service:auto-service-annotations:1.1.1",
@@ -219,7 +219,7 @@ maven.install(
219219
"org.junit.platform:junit-platform-commons:1.12.1",
220220
"org.junit.platform:junit-platform-engine:1.12.1",
221221
"org.mockito:mockito-core:5.16.1",
222-
"org.redisson:redisson:3.45.0",
222+
"org.redisson:redisson:3.45.1",
223223
"org.slf4j:slf4j-api:2.0.17",
224224
"org.slf4j:slf4j-jdk14:2.0.17",
225225
"org.tomlj:tomlj:1.1.1",

common/repositories.bzl

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/en-US/firefox-136.0.1.tar.xz",
15-
sha256 = "326c3dadd05153a6825145c9200f48021e039593cd6d6c434abee326e6096835",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/en-US/firefox-136.0.2.tar.xz",
15+
sha256 = "7ea3882e814669784f0960e4d6bb50a0ac88997a1d17fb125d0f411961ad763a",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.1/mac/en-US/Firefox%20136.0.1.dmg",
37-
sha256 = "416f5edf1e9fb938ccaea798adfe177ef7a4072c95a527cb460f3417d1ef5266",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.2/mac/en-US/Firefox%20136.0.2.dmg",
37+
sha256 = "69a917a6cdfa7c5ac44d8df9c03329faf46cb8b4f969826f2b33c1fd4cb43f08",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b6/linux-x86_64/en-US/firefox-137.0b6.tar.xz",
54-
sha256 = "c8348f336162709f8918178a3e11d2e70f91fbc82a8fb8839d45ffdee1c57367",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b8/linux-x86_64/en-US/firefox-137.0b8.tar.xz",
54+
sha256 = "6d83ac868fab6dfc6226cff129b327a2f7dfde17fc7cc1164ab42c8637615776",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b6/mac/en-US/Firefox%20137.0b6.dmg",
76-
sha256 = "1bd8bcef306aaa99e7595a9a5a8fb1df4c977fc661c815d33b7636fb48410154",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b8/mac/en-US/Firefox%20137.0b8.dmg",
76+
sha256 = "1783388e740355ffaf215bf10d32ce0d4aaf65183a9eeef64bee3c0dcce2a6e2",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/652efb17-53e6-4847-a085-3db94160e488/MicrosoftEdge-134.0.3124.68.pkg",
127-
sha256 = "46a5de4b61594b4742d5f7809ec6045eef1a0f244c4bf846b4eea108e72c8776",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/d7f65f74-be89-4936-ad8d-c6a5d8ba8efd/MicrosoftEdge-134.0.3124.77.pkg",
127+
sha256 = "a768a8708129ba776ef28a1c4d86208398d2eaf898028d89f5dfde465fcdf07e",
128128
move = {
129-
"MicrosoftEdge-134.0.3124.68.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-134.0.3124.77.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/134.0.3124.68/edgedriver_mac64.zip",
186-
sha256 = "fb699791bea79d0e5ba53d92e8745241124a5d476669bdae468db9b28da43b51",
185+
url = "https://msedgedriver.azureedge.net/134.0.3124.77/edgedriver_mac64.zip",
186+
sha256 = "699918e20020e31f3a8ec186c631d31e90038ad65e793d8d4b25bbc3332cf7c1",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/linux64/chrome-linux64.zip",
203-
sha256 = "99f05b875209cdbf7490dc431a525fd373788521fb9e8aca68c761fc5fc400e5",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/linux64/chrome-linux64.zip",
203+
sha256 = "77cea8bb689792cd35a82d26d4025b06ce507852ea84505f5912f691c6448789",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "d42a196a68b4d4fb7d096308df96f7b7311a316934200e842f7a30f93fb6ecdc",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "cbd2aac7add53395b7d6722999f6b63aa1eac5ca20c4255816c369ae1e34b70a",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/linux64/chromedriver-linux64.zip",
247-
sha256 = "58df717d51484b9f3ac188af5231cdc77255daa72d0b2b86481bee54e398ce2f",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/linux64/chromedriver-linux64.zip",
247+
sha256 = "00c9c9a3f55859424d4bc5f3e325e2eb59f17e0587f31db74c775a252a4b4e62",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "30b2ee9abdd73d56e0e1d390bf04fe1a14a88522b765b045b42b768c2be74738",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "6cb5a24c82e0acca8574ccff0e8c6f08d929a9bc9fd2cee47fd3af1b3e8167d4",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

common/selenium_manager.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ def selenium_manager():
66
http_file(
77
name = "download_sm_linux",
88
executable = True,
9-
sha256 = "9d9f1306f11a0b8aee174e01e21195177f031e12a7d473cf565de0db69bd504d",
10-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-14ef6b5/selenium-manager-linux",
9+
sha256 = "c684e0a0b18bd16048d911ce6bfcb896185673701fa463785bde84b43468709b",
10+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-7ec0311/selenium-manager-linux",
1111
)
1212

1313
http_file(
1414
name = "download_sm_macos",
1515
executable = True,
16-
sha256 = "98bb3c77965ddd0892f2a70168aa4a6b9a6e3ed98cd850783461c428f9dc4ffe",
17-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-14ef6b5/selenium-manager-macos",
16+
sha256 = "dfa9839d7c5c4e5c63a0758cd33d4cfbf98c53bfe04a9651005ea81f72a43cd5",
17+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-7ec0311/selenium-manager-macos",
1818
)
1919

2020
http_file(
2121
name = "download_sm_windows",
2222
executable = True,
23-
sha256 = "0bb96fafc3a38d35d1dd6e6eb350104dcdebd268a6c4b6f771055b324288718a",
24-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-14ef6b5/selenium-manager-windows.exe",
23+
sha256 = "7de20eb677bde09b234807d4cb7a16ed3c874bf8b05e38e75e9242b65f9af85e",
24+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-7ec0311/selenium-manager-windows.exe",
2525
)
2626

2727
def _selenium_manager_artifacts_impl(_ctx):

java/maven_install.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1019110553,
4-
"__RESOLVED_ARTIFACTS_HASH": 1116102489,
3+
"__INPUT_ARTIFACTS_HASH": 466809341,
4+
"__RESOLVED_ARTIFACTS_HASH": -983027519,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -138,17 +138,17 @@
138138
},
139139
"com.google.guava:failureaccess": {
140140
"shasums": {
141-
"jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064",
142-
"sources": "dd3bfa5e2ec5bc5397efb2c3cef044c192313ff77089573667ff97a60c6978e0"
141+
"jar": "cbfc3906b19b8f55dd7cfd6dfe0aa4532e834250d7f080bd8d211a3e246b59cb",
142+
"sources": "6fef4dfd2eb9f961655f2a3c4ea87c023618d9fcbfb6b104c17862e5afe66b97"
143143
},
144-
"version": "1.0.2"
144+
"version": "1.0.3"
145145
},
146146
"com.google.guava:guava": {
147147
"shasums": {
148-
"jar": "b918c98a7e44dbe94ebd9fe3e40cddaadb5a93e6a78eb6008b42df237241e538",
149-
"sources": "55ef6603b6ab1f6e3ae810b127561650ed682eb5f3fb50a212a658a74087b457"
148+
"jar": "874b1f0ee75c77c12d069d14c9b8b268b7b2cbd7ce679655c225f4a9942dc9c8",
149+
"sources": "1abdc24ae4f84d2f4022254b089aa6dec26bd0f7edf3fb2e3d3691fd6910bb21"
150150
},
151-
"version": "33.4.0-jre"
151+
"version": "33.4.5-jre"
152152
},
153153
"com.google.guava:listenablefuture": {
154154
"shasums": {
@@ -739,10 +739,10 @@
739739
},
740740
"org.redisson:redisson": {
741741
"shasums": {
742-
"jar": "e29893a0fd9bd63e5a3963d9b534f44a864872405b373ddd2f93ac96e43374e8",
743-
"sources": "fea7fba78f076717a33b8826af4dec7063f2014b653987e3d0b68e50b6c4f1d2"
742+
"jar": "3a0bbc732cd52ccd14ad2192b4afa9ee2415e1965373dbe870c70e0bc51596c1",
743+
"sources": "c4acc5210d271ab7854e421cc3fcb900685e81c97711a4553ee49a01b383f6b8"
744744
},
745-
"version": "3.45.0"
745+
"version": "3.45.1"
746746
},
747747
"org.slf4j:slf4j-api": {
748748
"shasums": {
@@ -846,12 +846,11 @@
846846
"com.google.guava:guava"
847847
],
848848
"com.google.guava:guava": [
849-
"com.google.code.findbugs:jsr305",
850849
"com.google.errorprone:error_prone_annotations",
851850
"com.google.guava:failureaccess",
852851
"com.google.guava:listenablefuture",
853852
"com.google.j2objc:j2objc-annotations",
854-
"org.checkerframework:checker-qual"
853+
"org.jspecify:jspecify"
855854
],
856855
"com.graphql-java:graphql-java": [
857856
"com.graphql-java:java-dataloader",

py/docs/README.rst

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,61 +11,72 @@ How to build docs
1111
=================
1212

1313
One can build the Python documentation without doing a full bazel build. The
14-
following instructions will build the setup a virtual environment and installs tox, clones the
15-
selenium repo and then runs ``tox -c py/tox.ini`` building the Python documentation.
14+
following instructions will build the setup a virtual environment and installs tox,
15+
clones the selenium repo and then runs ``tox -c py/tox.ini -e docs``, building the
16+
Python documentation.
1617

1718
.. code-block:: console
1819
19-
virtualenv test-py38-env
20-
source test-py38-env/bin/activate
20+
python3 -m venv venv
21+
source venv/bin/activate
2122
pip install tox
2223
git clone [email protected]:SeleniumHQ/selenium.git
2324
cd selenium/
2425
# uncomment and switch to your development branch if needed
2526
#git switch -c feature-branch origin/feature-branch
26-
tox -c py/tox.ini
27+
tox -c py/tox.ini -e docs
28+
29+
This works in a similar manner as the larger selenium bazel build, but does just the Python
30+
documentation portion.
2731

28-
Works in similar manner as the larger selenium bazel doing just the python documentation portion.
2932

3033
What is happening under the covers of tox, sphinx
3134
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32-
tox is essentially a build tool for Python. Here it setups its own virtualenv and installs the
33-
documentation packages (sphinx and jinja2) as well as the required selenium python
34-
dependencies. Then tox runs the sphinx generate autodoc stub files and then builds the docs.
35+
36+
tox is essentially a build tool for Python. Here it sets up its own virtual env and installs
37+
the documentation packages (sphinx and jinja2) as well as the required selenium python
38+
dependencies. Then tox runs the ``sphinx-autogen`` command to generate autodoc stub pages.
39+
Then it runs ``sphinx-build`` to build the HTML docs.
3540

3641
Sphinx is .. well a much larger topic then what we could cover here. Most important to say
37-
here is that the docs are using the "classic" theme and than the majority of the api documentation
38-
is autogenerated. There is plenty of information available and currently the documentation is
39-
fairly small and not complex. So some basic understanding of restructed text and the Sphinx tool chain
40-
should be sufficient to contribute and develop the Python docs.
42+
here is that the docs are using the "sphinx-material" theme (AKA "Material for Sphinx" theme)
43+
and the the majority of the api documentation is autogenerated. There is plenty of information
44+
available and currently the documentation is fairly small and not complex. So some basic
45+
understanding of reStructuredText and the Sphinx tool chain should be sufficient to contribute
46+
and develop the Python docs.
47+
48+
49+
To clean up the build assets and tox cache
50+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4151

42-
To clean up the build / tox cache
43-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44-
Although there is a Sphinx Makefile option to clean up using the tox environment above one can
45-
manually clean the build by deleting the build directory on the root (selenium/build using the
46-
default directory on git clone). Noting that both Sphinx and tox cache parts of their build and
47-
recognize changes to speed up their respective builds. But at times one wants to start fresh
48-
deleting the aformentioned directory will clean the Sphinx cache or removing selenium/py/.tox
49-
directory for cleaning the tox environment.
52+
Although there is a Sphinx Makefile option, to clean up using the tox environment above, one can
53+
manually clean the build assets by deleting the ``build`` directory on the root (``selenium/build``
54+
using the default directory on git clone). Note that tox caches parts of the build and recognizes
55+
changes to speed up the build. To start fresh, delete the aformentioned directory to clean the
56+
Sphinx build assets and delete the ``selenium/py/.tox`` directory to clean the tox environment.
5057

5158

5259
Known documentation issues
5360
==========================
61+
5462
The API Reference primarily builds from the source code. But currently the initial template stating
55-
which modules to document is hard coded within py/docs/source/api.rst. So if modules are added or
56-
removed then the generated docs will be inaccurate. It would be preferred that the API docs generate
57-
soley from the code if possible. This is being tracked in `#14178 <https://github.com/SeleniumHQ/selenium/issues/14178>`_
63+
which modules to document is hard coded within ``py/docs/source/api.rst``. So if modules are added or
64+
removed, then the generated docs will be inaccurate. It would be preferred that the API docs generate
65+
soley from the code if possible. This is being tracked in
66+
`#14178 <https://github.com/SeleniumHQ/selenium/issues/14178>`_
5867

59-
We are working through the Sphinx build Warnings and Errors trying to clean up botht the syntax and
68+
We are working through the Sphinx build warnings and errors, trying to clean up both the syntax and
6069
the build.
6170

71+
6272
Contributing to Python docs
6373
===========================
74+
6475
First it is recommended that you read the main `CONTRIBUTING.md <https://github.com/SeleniumHQ/selenium/blob/trunk/CONTRIBUTING.md>`_.
6576

66-
Some steps for contibuting to the Python documentation ..
77+
Some steps for contibuting to the Python documentation ...
6778

68-
- Check out changes locally using instruction above.
69-
- Try to resolve any warnings/issues.
70-
- If too arduous either ask for help or add to list of known issue.
71-
- If this process is updated please update this doc as well to help the next person.
79+
- Check out changes locally using instructions above.
80+
- Try to resolve any warnings/errors.
81+
- If too arduous, either ask for help or add to the list of known issues.
82+
- If this process is updated, please update this doc as well to help the next person.

py/docs/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
Jinja2==3.1.5
2-
Sphinx==7.1.2
1+
Jinja2==3.1.6
2+
Sphinx==7.4.7
3+
sphinx-material==0.0.36

py/docs/selenium_logo_small.png

647 Bytes
Loading

0 commit comments

Comments
 (0)