Merge branch 'trunk' into py-bidi-webextension

Author: navin772

.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,6 +1,7 @@
 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")

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:]))

common/devtools/pdl.py

@@ -8,64 +8,72 @@
 import re
 import sys
 
-description = ''
+description = ""
 
 
-primitiveTypes = ['integer', 'number', 'boolean', 'string', 'object',
-                  'any', 'array', 'binary']
+primitiveTypes = [
+    "integer",
+    "number",
+    "boolean",
+    "string",
+    "object",
+    "any",
+    "array",
+    "binary",
+]
 
 
 def assignType(item, type, is_array=False, map_binary_to_string=False):
     if is_array:
-        item['type'] = 'array'
-        item['items'] = collections.OrderedDict()
-        assignType(item['items'], type, False, map_binary_to_string)
+        item["type"] = "array"
+        item["items"] = collections.OrderedDict()
+        assignType(item["items"], type, False, map_binary_to_string)
         return
 
-    if type == 'enum':
-        type = 'string'
-    if map_binary_to_string and type == 'binary':
-        type = 'string'
+    if type == "enum":
+        type = "string"
+    if map_binary_to_string and type == "binary":
+        type = "string"
     if type in primitiveTypes:
-        item['type'] = type
+        item["type"] = type
     else:
-        item['$ref'] = type
+        item["$ref"] = type
 
 
 def createItem(d, experimental, deprecated, name=None):
     result = collections.OrderedDict(d)
     if name:
-        result['name'] = name
+        result["name"] = name
     global description
     if description:
-        result['description'] = description.strip()
+        result["description"] = description.strip()
     if experimental:
-        result['experimental'] = True
+        result["experimental"] = True
     if deprecated:
-        result['deprecated'] = True
+        result["deprecated"] = True
     return result
 
 
 def parse(data, file_name, map_binary_to_string=False):
     protocol = collections.OrderedDict()
-    protocol['version'] = collections.OrderedDict()
-    protocol['domains'] = []
+    protocol["version"] = collections.OrderedDict()
+    protocol["domains"] = []
     domain = None
     item = None
     subitems = None
     nukeDescription = False
     global description
-    lines = data.split('\n')
+    lines = data.split("\n")
     for i in range(0, len(lines)):
         if nukeDescription:
-            description = ''
+            description = ""
             nukeDescription = False
         line = lines[i]
         trimLine = line.strip()
 
-        if trimLine.startswith('#'):
+        if trimLine.startswith("#"):
             if len(description):
-                description += '\n'
+                description += "\n"
             description += trimLine[2:]
             continue
         else:
@@ -74,99 +82,103 @@ def parse(data, file_name, map_binary_to_string=False):
         if len(trimLine) == 0:
             continue
 
-        match = re.compile(
-            r'^(experimental )?(deprecated )?domain (.*)').match(line)
+        match = re.compile(r"^(experimental )?(deprecated )?domain (.*)").match(line)
         if match:
-            domain = createItem({'domain' : match.group(3)}, match.group(1),
-                                match.group(2))
-            protocol['domains'].append(domain)
+            domain = createItem(
+                {"domain": match.group(3)}, match.group(1), match.group(2)
+            )
+            protocol["domains"].append(domain)
             continue
 
-        match = re.compile(r'^  depends on ([^\s]+)').match(line)
+        match = re.compile(r"^  depends on ([^\s]+)").match(line)
         if match:
-            if 'dependencies' not in domain:
-                domain['dependencies'] = []
-            domain['dependencies'].append(match.group(1))
+            if "dependencies" not in domain:
+                domain["dependencies"] = []
+            domain["dependencies"].append(match.group(1))
             continue
 
-        match = re.compile(r'^  (experimental )?(deprecated )?type (.*) '
-                           r'extends (array of )?([^\s]+)').match(line)
+        match = re.compile(
+            r"^  (experimental )?(deprecated )?type (.*) "
+            r"extends (array of )?([^\s]+)"
+        ).match(line)
         if match:
-            if 'types' not in domain:
-                domain['types'] = []
-            item = createItem({'id': match.group(3)}, match.group(1), match.group(2))
+            if "types" not in domain:
+                domain["types"] = []
+            item = createItem({"id": match.group(3)}, match.group(1), match.group(2))
             assignType(item, match.group(5), match.group(4), map_binary_to_string)
-            domain['types'].append(item)
+            domain["types"].append(item)
             continue
 
         match = re.compile(
-            r'^  (experimental )?(deprecated )?(command|event) (.*)').match(line)
+            r"^  (experimental )?(deprecated )?(command|event) (.*)"
+        ).match(line)
         if match:
             list = []
-            if match.group(3) == 'command':
-                if 'commands' in domain:
-                    list = domain['commands']
+            if match.group(3) == "command":
+                if "commands" in domain:
+                    list = domain["commands"]
                 else:
-                    list = domain['commands'] = []
+                    list = domain["commands"] = []
             else:
-                if 'events' in domain:
-                    list = domain['events']
+                if "events" in domain:
+                    list = domain["events"]
                 else:
-                    list = domain['events'] = []
+                    list = domain["events"] = []
 
             item = createItem({}, match.group(1), match.group(2), match.group(4))
             list.append(item)
             continue
 
         match = re.compile(
-            r'^      (experimental )?(deprecated )?(optional )?'
-            r'(array of )?([^\s]+) ([^\s]+)').match(line)
+            r"^      (experimental )?(deprecated )?(optional )?"
+            r"(array of )?([^\s]+) ([^\s]+)"
+        ).match(line)
         if match:
             param = createItem({}, match.group(1), match.group(2), match.group(6))
             if match.group(3):
-                param['optional'] = True
+                param["optional"] = True
             assignType(param, match.group(5), match.group(4), map_binary_to_string)
-            if match.group(5) == 'enum':
-                enumliterals = param['enum'] = []
+            if match.group(5) == "enum":
+                enumliterals = param["enum"] = []
             subitems.append(param)
             continue
 
-        match = re.compile(r'^    (parameters|returns|properties)').match(line)
+        match = re.compile(r"^    (parameters|returns|properties)").match(line)
         if match:
             subitems = item[match.group(1)] = []
             continue
 
-        match = re.compile(r'^    enum').match(line)
+        match = re.compile(r"^    enum").match(line)
         if match:
-            enumliterals = item['enum'] = []
+            enumliterals = item["enum"] = []
             continue
 
-        match = re.compile(r'^version').match(line)
+        match = re.compile(r"^version").match(line)
         if match:
             continue
 
-        match = re.compile(r'^  major (\d+)').match(line)
+        match = re.compile(r"^  major (\d+)").match(line)
         if match:
-            protocol['version']['major'] = match.group(1)
+            protocol["version"]["major"] = match.group(1)
             continue
 
-        match = re.compile(r'^  minor (\d+)').match(line)
+        match = re.compile(r"^  minor (\d+)").match(line)
         if match:
-            protocol['version']['minor'] = match.group(1)
+            protocol["version"]["minor"] = match.group(1)
             continue
 
-        match = re.compile(r'^    redirect ([^\s]+)').match(line)
+        match = re.compile(r"^    redirect ([^\s]+)").match(line)
         if match:
-            item['redirect'] = match.group(1)
+            item["redirect"] = match.group(1)
             continue
 
-        match = re.compile(r'^      (  )?[^\s]+$').match(line)
+        match = re.compile(r"^      (  )?[^\s]+$").match(line)
         if match:
             # enum literal
             enumliterals.append(trimLine)
             continue
 
-        print('Error in %s:%s, illegal token: \t%s' % (file_name, i, line))
+        print("Error in %s:%s, illegal token: \t%s" % (file_name, i, line))
         sys.exit(1)
     return protocol
 

dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs

@@ -17,11 +17,9 @@
 // under the License.
 // </copyright>
 
-using System.Text.Json.Serialization;
-
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
-public record ClientWindowInfo([property: JsonPropertyName("active")] bool IsActive, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
+public record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
 
 public enum ClientWindowState
 {

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs

@@ -54,7 +54,7 @@ public abstract record ClipRectangle;
 
 public record BoxClipRectangle(double X, double Y, double Width, double Height) : ClipRectangle;
 
-public record ElementClipRectangle([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : ClipRectangle;
+public record ElementClipRectangle(Script.ISharedReference Element) : ClipRectangle;
 
 public record CaptureScreenshotResult(string Data) : EmptyResult
 {