Merge trunk and fix conflicts

Author: cgoldberg

.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.35 and we can't fix old versions.
+      description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
       placeholder: e.g., 4.17.0
     validations:
       required: true

.github/workflows/bazel.yml

@@ -51,6 +51,11 @@ on:
         required: false
         type: string
         default: ''
+      python-version:
+        description: Custom Python version to use
+        required: false
+        type: string
+        default: ''
       ruby-version:
         description: Custom Ruby version to use
         required: false
@@ -101,6 +106,9 @@ jobs:
         if: inputs.os != 'windows'
         run: |
           sudo rm -rf "$CHROMEWEBDRIVER" "$EDGEWEBDRIVER" "$GECKOWEBDRIVER"
+      - name: Set Python version
+        if: inputs.python-version != ''
+        run: echo '${{ inputs.python-version }}' > py/.python-version
       - name: Set Ruby version
         if: inputs.ruby-version != ''
         run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
@@ -126,6 +134,8 @@ jobs:
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
+          # Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
+          output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
           cache-version: 2
           disk-cache: ${{ inputs.cache-key }}
           external-cache: |

.github/workflows/ci-python.yml

@@ -11,49 +11,73 @@ jobs:
     with:
       name: Build
       cache-key: py-build
-      run: bazel build //py:selenium-wheel //py:selenium-sdist
+      run: |
+        bazel build //py:selenium-wheel //py:selenium-sdist
 
   docs:
     name: Documentation
-    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.30.2
+          pip install tox
       - name: Generate docs
-        run: tox -c py/tox.ini
+        run: |
+          tox -c py/tox.ini
         env:
           TOXENV: docs
 
-  mypy:
-    name: Mypy
-    needs: build
+  typing:
+    name: Type Checker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.30.2
+          pip install tox
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true
         env:
           TOXENV: mypy
 
+  unit-tests:
+    name: Unit Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: '3.10'
+            os: ubuntu
+          - python-version: '3.10'
+            os: macos
+          - python-version: '3.14'
+            os: ubuntu
+          - python-version: '3.14'
+            os: macos
+    with:
+      name: Unit Tests (${{ matrix.python-version }}, ${{ matrix.os }})
+      os: ${{ matrix.os }}
+      python-version: ${{ matrix.python-version }}
+      cache-key: python-unit-test-${{ matrix.python-version }}
+      run: |
+        bazel test //py:unit
+
   remote-tests:
     name: Remote Tests
     needs: build
@@ -67,7 +91,8 @@ jobs:
       name: Integration Tests (remote, ${{ matrix.browser }})
       browser: ${{ matrix.browser }}
       cache-key: py-remote-${{ matrix.browser }}
-      run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
 
   browser-tests:
     name: Browser Tests
@@ -89,10 +114,30 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
+
+  browser-tests-windows:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: chrome
+            os: windows
+          - browser: edge
+            os: windows
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        fsutil 8dot3name set 0
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
 
-  safari-tests:
+  browser-tests-macos:
     name: Browser Tests
     needs: build
     uses: ./.github/workflows/bazel.yml
@@ -108,4 +153,4 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

@@ -96,7 +96,7 @@ jobs:
       matrix:
         include:
           - browser: edge
-            os: windows
+            os: macos
     with:
       name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}

.github/workflows/update-documentation.yml

@@ -66,11 +66,11 @@ jobs:
         with:
           java-version: 17
           distribution: 'temurin'
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Install dependencies
         if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
         run: |

AUTHORS

@@ -78,6 +78,7 @@ Andrii Rohovets <[email protected]>
 Andy Duncan <[email protected]>
 Angie Jones <[email protected]>
 anonymous_sdet <[email protected]>
+Anthony Richardson <[email protected]>
 Anthony Sottile <[email protected]>
 Anton Usmansky <[email protected]>
 Anton Velma <[email protected]>
@@ -318,6 +319,7 @@ GFHuang <[email protected]>
 ggkiokas <[email protected]>
 Ghjuvan Lacambre <[email protected]>
 Giorgos Tzampanakis <[email protected]>
+Giulio Longfils <[email protected]>
 glaszig <[email protected]>
 Glib Briia <[email protected]>
 Godefroid Chapelle
@@ -367,6 +369,7 @@ Iain Dawson <[email protected]>
 Ian Lesperance <[email protected]>
 ian zhang <[email protected]>
 Iaroslav Naidon <[email protected]>
+iDONi <[email protected]>
 ifland <[email protected]>
 Ilya Kozhevnikov <[email protected]>
 Ilyas Bayraktar <[email protected]>
@@ -681,6 +684,7 @@ Nirantak Raghav <[email protected]>
 Nitish <[email protected]>
 Noel Gordon
 Noritaka Kobayashi <[email protected]>
+NoStory-py <[email protected]>
 Nowell Strite <[email protected]>
 Nozomi Ito <[email protected]>
 no_author <[email protected]>
@@ -703,6 +707,7 @@ Outsider <[email protected]>
 Paladin Wang <[email protected]>
 Pallavi <[email protected]>
 Palmer Bandy <[email protected]>
+Paresh Gupta <[email protected]>
 Pat Tullmann <[email protected]>
 Patrice Jaton <[email protected]>
 Patrick Beart <[email protected]>
@@ -900,6 +905,7 @@ Ulf Adams <[email protected]>
 Ulrich Buchgraber <[email protected]>
 User253489 <[email protected]>
 V24 <[email protected]>
+Vaibhav Gupta <[email protected]>
 Valery Yatsynovich <[email protected]>
 Varun Menon <[email protected]>
 varunsurapaneni <[email protected]>
@@ -908,6 +914,8 @@ vedanthvdev <[email protected]>
 vergiliu <[email protected]>
 vflame <[email protected]>
 Victor Tang <[email protected]>
+Victoria Ivanova <[email protected]>
+Victoria Ivanova <[email protected]>
 Viet Nguyen Duc <[email protected]>
 Vijay Singh <[email protected]>
 Vijendarn Selvarajah <[email protected]>