Merge branch 'trunk' into py_webdriver_wait_custom_msg

Author: Delta456

.github/workflows/ci-grid-ui.yml

@@ -0,0 +1,38 @@
+name: CI - Grid UI
+
+on:
+  pull_request:
+    paths:
+      - 'javascript/grid-ui/**'
+  push:
+    branches:
+      - trunk
+    paths:
+      - 'javascript/grid-ui/**'
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  grid-ui-tests:
+    runs-on: ubuntu-latest
+    name: Grid UI Component Tests
+    steps:
+      - name: Checkout source tree
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: 'npm'
+          cache-dependency-path: 'javascript/grid-ui/package.json'
+
+      - name: Install dependencies
+        working-directory: javascript/grid-ui
+        run: npm install
+
+      - name: Run component tests
+        working-directory: javascript/grid-ui
+        run: npm test

.github/workflows/ci-python.yml

@@ -27,34 +27,12 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: tox -c py/tox.ini
         env:
           TOXENV: docs
 
-  lint:
-    name: Lint
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source tree
-        uses: actions/checkout@v4
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.9
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install tox==4.6.4
-      - name: Test with tox
-        run: tox -c py/tox.ini
-        env:
-          # If this fails, it will exit. Local work should be using `tox -e linting` prior to committing.
-          # the linting-ci recipe exists solely for CI and will not attempt to rewrite any files in-place etc.
-          TOXENV: linting-ci
-
   mypy:
     name: Mypy
     needs: build
@@ -69,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: |
           tox -c py/tox.ini -- --cobertura-xml-report ci || true

MODULE.bazel

@@ -1,10 +1,11 @@
 module(name = "selenium")
 
 bazel_dep(name = "apple_rules_lint", version = "0.4.0")
+bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
 bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
 bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
-bazel_dep(name = "aspect_rules_js", version = "2.1.3")
-bazel_dep(name = "aspect_rules_ts", version = "3.4.0")
+bazel_dep(name = "aspect_rules_js", version = "2.3.7")
+bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
 bazel_dep(name = "bazel_features", version = "1.23.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")

README.md

@@ -217,21 +217,11 @@ To automatically update and pin new dependencies, run:
 
 ### Python
 
-#### Linting
+#### Linting and Formatting
 
 We follow the [PEP8 Style Guide for Python Code](https://peps.python.org/pep-0008) (except we use a 120 character line length).
-This is checked and enforced with several linting tools, including
-[black](https://pypi.org/project/black),
-[docformatter](https://pypi.org/project/docformatter),
-[flake8](https://flake8.pycqa.org),
-and [isort](https://pycqa.github.io/isort).
-
-To run all of the linting tools:
-```shell
-./go py:lint
-```
-
-You need `tox` installed to run the linting tools (`pip install tox`).
+This is checked and enforced with [ruff](https://docs.astral.sh/ruff/), a linting/formatting tool.
+There is also an auto-formatting script that can be run: `./scripts/format.sh`
 
 #### Local Installation
 

Rakefile

@@ -669,11 +669,6 @@ namespace :py do
     @git.add(conf)
   end
 
-  desc 'Update Python Syntax'
-  task :lint do
-    sh 'tox -c py/tox.ini -e linting'
-  end
-
   namespace :test do
     desc 'Python unit tests'
     task :unit do
@@ -1165,7 +1160,6 @@ namespace :all do
   task :lint do
     ext = /mswin|msys|mingw|cygwin|bccwin|wince|emc/.match?(RbConfig::CONFIG['host_os']) ? 'ps1' : 'sh'
     sh "./scripts/format.#{ext}", verbose: true
-    Rake::Task['py:lint'].invoke
   end
 
   # Example: `./go all:prepare 4.31.0 early-stable`

common/devtools/convert_protocol_to_json.py

@@ -10,13 +10,20 @@
 
 import pdl
 
+
 def main(argv):
-    parser = argparse.ArgumentParser(description=(
-        "Converts from .pdl to .json by invoking the pdl Python module."))
-    parser.add_argument('--map_binary_to_string', type=bool,
-                        help=('If set, binary in the .pdl is mapped to a '
-                              'string in .json. Client code will have to '
-                              'base64 decode the string to get the payload.'))
+    parser = argparse.ArgumentParser(
+        description=("Converts from .pdl to .json by invoking the pdl Python module.")
+    )
+    parser.add_argument(
+        "--map_binary_to_string",
+        type=bool,
+        help=(
+            "If set, binary in the .pdl is mapped to a "
+            "string in .json. Client code will have to "
+            "base64 decode the string to get the payload."
+        ),
+    )
     parser.add_argument("pdl_file", help="The .pdl input file to parse.")
     parser.add_argument("json_file", help="The .json output file write.")
     args = parser.parse_args(argv)
@@ -26,10 +33,10 @@ def main(argv):
     protocol = pdl.loads(pdl_string, file_name, args.map_binary_to_string)
     input_file.close()
 
-    output_file = open(os.path.normpath(args.json_file), 'w')
-    json.dump(protocol, output_file, indent=4, separators=(',', ': '))
+    output_file = open(os.path.normpath(args.json_file), "w")
+    json.dump(protocol, output_file, indent=4, separators=(",", ": "))
     output_file.close()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     sys.exit(main(sys.argv[1:]))