Merge branch 'trunk' into rb_add_support_for_chrome_beta

Author: aguspe

.gitignore

@@ -76,6 +76,7 @@ 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

py/conftest.py

@@ -370,3 +370,29 @@ def firefox_options(request):
     if request.config.option.headless:
         options.add_argument("-headless")
     return options
+
+
+@pytest.fixture
+def chromium_options(request):
+    try:
+        driver_option = request.config.option.drivers[0].lower()
+    except (AttributeError, TypeError):
+        raise Exception("This test requires a --driver to be specified")
+
+    # Skip if not Chrome or Edge
+    if driver_option not in ("chrome", "edge"):
+        pytest.skip(f"This test requires Chrome or Edge, got {driver_option}")
+
+    # skip tests in the 'remote' directory if run with a local driver
+    if request.node.path.parts[-2] == "remote" and get_driver_class(driver_option) != "Remote":
+        pytest.skip(f"Remote tests can't be run with driver '{driver_option}'")
+
+    if driver_option == "chrome":
+        options = webdriver.ChromeOptions()
+    elif driver_option == "edge":
+        options = webdriver.EdgeOptions()
+
+    if request.config.option.headless:
+        options.add_argument("--headless=new")
+
+    return options

py/docs/.readthedocs.yaml

@@ -10,10 +10,11 @@ version: 2
 build:
   os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.12"
   commands:
     - pip install -r py/docs/requirements.txt
     - pip install -r py/requirements.txt
+    - cd py && python3 generate_api_module_listing.py && cd
     - PYTHONPATH=py sphinx-autogen -o $READTHEDOCS_OUTPUT/html py/docs/source/api.rst
     - PYTHONPATH=py sphinx-build -b html -d build/docs/doctrees py/docs/source $READTHEDOCS_OUTPUT/html
 

py/docs/Makefile

@@ -49,22 +49,14 @@ and develop the Python docs.
 To clean up the build assets and tox cache
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Although there is a Sphinx Makefile option, to clean up using the tox environment above, one can
-manually clean the build assets by deleting the ``build`` directory on the root (``selenium/build``
-using the default directory on git clone). Note that tox caches parts of the build and recognizes
-changes to speed up the build. To start fresh, delete the aformentioned directory to clean the
-Sphinx build assets and delete the ``selenium/py/.tox`` directory to clean the tox environment.
+After using the tox environment above, you can clean up the build assets by deleting the ``build``
+directory in the root of the repo. Note that tox caches parts of the build and recognizes changes
+to speed up the build. To start fresh, delete the ``py/.tox`` directory to clean the tox environment.
 
 
 Known documentation issues
 ==========================
 
-The API Reference primarily builds from the source code. But currently the initial template stating
-which modules to document is hard coded within ``py/docs/source/api.rst``. So if modules are added or
-removed, then the generated docs will be inaccurate. It would be preferred that the API docs generate
-soley from the code if possible. This is being tracked in
-`#14178 <https://github.com/SeleniumHQ/selenium/issues/14178>`_
-
 We are working through the Sphinx build warnings and errors, trying to clean up both the syntax and
 the build.