YAML and Python lint changes

Author: natecook1000

.github/workflows/pull_request.yml

@@ -20,4 +20,3 @@ jobs:
     with:
       license_header_check_project_name: "Swift.org"
       unacceptable_language_check_enabled: false
-      

Utils/benchmark-generators/generateDiceNotation.py

@@ -17,50 +17,59 @@
 minDigits = 1
 maxDigits = 4
 
+
 def number():
-  return "".join([random.choice(string.digits) for _ in range(random.randint(minDigits,maxDigits))])
+    return "".join([random.choice(string.digits)
+                   for _ in range(random.randint(minDigits, maxDigits))])
+
 
 minWord = 5
 maxWord = 10
+
+
 def word():
-  return "".join([random.choice(string.ascii_letters) for _ in range(random.randint(minWord,maxWord))])
+    return "".join([random.choice(string.ascii_letters)
+                   for _ in range(random.randint(minWord, maxWord))])
+
 
 minDice = 1
 maxDice = 4
+
+
 def roll():
-  die = []
-  for _ in range(random.randint(minDice, maxDice)):
-    roll = ""
-    if random.randint(0,1) == 1:
-      roll += number()
-      
-    if random.randint(0,1) == 1:
-      roll += "d" + number()
-    else:
-      roll += "D" + number()
-      
-    die.append(roll)
-  return "+".join(die)
+    die = []
+    for _ in range(random.randint(minDice, maxDice)):
+        roll = ""
+        if random.randint(0, 1) == 1:
+            roll += number()
+
+        if random.randint(0, 1) == 1:
+            roll += "d" + number()
+        else:
+            roll += "D" + number()
+
+        die.append(roll)
+    return "+".join(die)
 
 
 line_num = 2000
 things_per_line = 10
 
 lines = []
 for _ in range(line_num):
-  line = []
-  for _ in range(things_per_line):
-    if random.randint(0,1) == 1:
-      line.append(word())
-    else:
-      line.append(roll())
-  lines.append(" ".join(line))
+    line = []
+    for _ in range(things_per_line):
+        if random.randint(0, 1) == 1:
+            line.append(word())
+        else:
+            line.append(roll())
+    lines.append(" ".join(line))
 
 dice_text = "\n    ".join(lines)
 
 dice_rolls = []
 for _ in range(2000):
-  dice_rolls.append(roll())
+    dice_rolls.append(roll())
 
 dice_rolls_formatted = "[" + ",\n    ".join(["\"" + x + "\"" for x in dice_rolls]) + "]"
 

Utils/benchmark-generators/generateEmails.py

@@ -26,15 +26,15 @@
 # issues but otherwise this should work
 emails = []
 for _ in range(n):
-  domain_len = random.randint(2,64)
-  locale_len = random.randint(2,64)
-  tld_len = random.randint(2,10)
-  
-  domain = "".join(random.sample(domain_charset, domain_len))
-  locale = "".join(random.sample(locale_charset, locale_len))
-  tld = "".join(random.sample(string.ascii_lowercase, tld_len))
-  email = locale + "@" + domain + "." + tld
-  emails.append(email)
+    domain_len = random.randint(2, 64)
+    locale_len = random.randint(2, 64)
+    tld_len = random.randint(2, 10)
+
+    domain = "".join(random.sample(domain_charset, domain_len))
+    locale = "".join(random.sample(locale_charset, locale_len))
+    tld = "".join(random.sample(string.ascii_lowercase, tld_len))
+    email = locale + "@" + domain + "." + tld
+    emails.append(email)
 
 res = """
 extension Inputs {{

Utils/benchmark-generators/generateNetworkingData.py

@@ -14,20 +14,25 @@
 
 random.seed(0)
 
+
 def ipv6():
-  return ":".join(["".join([random.choice(string.hexdigits) for _ in range(4)]) for _ in range(8)])
+    return ":".join(["".join([random.choice(string.hexdigits)
+                    for _ in range(4)]) for _ in range(8)])
+
 
 def ipv4():
-  return ".".join([str(random.randint(1,255)) for _ in range(4)])
+    return ".".join([str(random.randint(1, 255)) for _ in range(4)])
+
 
 def mac():
-  x = random.randint(0,1)
-  if x == 0:
-    raw = "{:02x}".format(random.randint(0,2**48-1))
-    return ":".join([raw[i:i + 2] for i in range(0, len(raw), 2)])
-  else:
-    raw = "{:02x}".format(random.randint(0,2**48-1))
-    return "-".join([raw[i:i + 2] for i in range(0, len(raw), 2)])
+    x = random.randint(0, 1)
+    if x == 0:
+        raw = "{:02x}".format(random.randint(0, 2**48 - 1))
+        return ":".join([raw[i:i + 2] for i in range(0, len(raw), 2)])
+    else:
+        raw = "{:02x}".format(random.randint(0, 2**48 - 1))
+        return "-".join([raw[i:i + 2] for i in range(0, len(raw), 2)])
+
 
 res = """
 extension Inputs {{

Utils/benchmark-generators/generateTaggedUnicode.py

@@ -27,9 +27,14 @@
 minLine = 10
 maxLine = 100
 
+
 def get_random(i):
-   return "".join([chr(random.randint(low, high)) for _ in range(i)])
-   
-lines = [start + get_random(random.randint(minLine, maxLine)) + end for _ in range(numLines)]
+    return "".join([chr(random.randint(low, high)) for _ in range(i)])
+
+
+lines = [
+    start + get_random(random.randint(minLine, maxLine)) + end
+    for _ in range(numLines)
+]
 
 print("\n".join(lines))

Utils/createBenchmark.py

@@ -10,12 +10,14 @@
 ##===----------------------------------------------------------------------===##
 
 # python3 createBenchmark.py MyRegexBenchmark
-# reference: https://github.com/apple/swift/blob/main/benchmark/scripts/create_benchmark.py
+# reference:
+# https://github.com/apple/swift/blob/main/benchmark/scripts/create_benchmark.py
 
 import argparse
 import os
 
-template = """//===----------------------------------------------------------------------===//
+template = """\
+//===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -34,34 +36,38 @@
 }}
 """
 
+
 def main():
     p = argparse.ArgumentParser()
     p.add_argument("name", help="The name of the new benchmark to be created")
     args = p.parse_args()
-    
+
     # create a file in Sources/RegexBenchmark/Suite with the benchmark template
     create_benchmark_file(args.name)
-    
+
     # add to the registration function in BenchmarkRunner
     register_benchmark(args.name)
 
+
 def create_benchmark_file(name):
-    contents = template.format(name= name)
+    contents = template.format(name=name)
     relative_path = create_relative_path("../Sources/RegexBenchmark/Suite/")
     source_file_path = os.path.join(relative_path, name + ".swift")
-    
+
     print(f"Creating new benchmark file: {source_file_path}")
     with open(source_file_path, "w") as f:
         f.write(contents)
 
+
 def register_benchmark(name):
-    relative_path = create_relative_path("../Sources/RegexBenchmark/BenchmarkRegistration.swift")
+    relative_path = create_relative_path(
+        "../Sources/RegexBenchmark/BenchmarkRegistration.swift")
 
     # read current contents into an array
     file_contents = []
     with open(relative_path, "r") as f:
         file_contents = f.readlines()
-    
+
     new_file_contents = []
     for line in file_contents:
         if "end of registrations" not in line:
@@ -70,14 +76,16 @@ def register_benchmark(name):
             # add the newest benchmark
             new_file_contents.append(f"    self.add{name}()\n")
             new_file_contents.append(line)
-    
+
     # write the new contents
     with open(relative_path, "w") as f:
         for line in new_file_contents:
             f.write(line)
-            
+
+
 def create_relative_path(file_path):
     return os.path.join(os.path.dirname(__file__), file_path)
 
+
 if __name__ == "__main__":
     main()