[webkit-changes] [281940] trunk/Tools

Thu, 02 Sep 2021 11:36:17 -0700

Title: [281940] trunk/Tools
Revision
281940
Author
aakash_j...@apple.com
Date
2021-09-02 11:35:22 -0700 (Thu, 02 Sep 2021)

Log Message

Move few scripts from python 2 to python3
https://bugs.webkit.org/show_bug.cgi?id=229817

Reviewed by Jonathan Bedard.

* Scripts/clean-webkit: Changed shebang to python3.
* CISupport/test-result-archive: Ditto.
* CISupport/ews-build/steps.py: Ditto.
* CISupport/build-webkit-org/steps.py:
(DownloadBuiltProduct): Use python 3 instead of python 2.
(ArchiveTestResults): Ditto.
* CISupport/download-built-product: Ditto.
(CleanWorkingDirectory):
(DownloadBuiltProduct):
(ArchiveTestResults):
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.

Modified Paths

Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281939 => 281940)


--- trunk/Tools/CISupport/build-webkit-org/steps.py	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2021-09-02 18:35:22 UTC (rev 281940)
@@ -395,7 +395,7 @@
 
 
 class DownloadBuiltProduct(shell.ShellCommand):
-    command = ["python", "./Tools/CISupport/download-built-product",
+    command = ["python3", "./Tools/CISupport/download-built-product",
         WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"),
         WithProperties(S3URL + "archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(got_revision)s.zip")]
     name = "download-built-product"
@@ -1091,7 +1091,7 @@
 
 
 class ArchiveTestResults(shell.ShellCommand):
-    command = ["python", "./Tools/CISupport/test-result-archive",
+    command = ["python3", "./Tools/CISupport/test-result-archive",
                WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
     name = "archive-test-results"
     description = ["archiving test results"]

Modified: trunk/Tools/CISupport/download-built-product (281939 => 281940)


--- trunk/Tools/CISupport/download-built-product	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/download-built-product	2021-09-02 18:35:22 UTC (rev 281940)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2009, 2020 Apple Inc.  All rights reserved.
 # Copyright (C) 2012 Google Inc. All rights reserved.

Modified: trunk/Tools/CISupport/ews-build/steps.py (281939 => 281940)


--- trunk/Tools/CISupport/ews-build/steps.py	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/ews-build/steps.py	2021-09-02 18:35:22 UTC (rev 281940)
@@ -275,7 +275,7 @@
     descriptionDone = ['Cleaned working directory']
     flunkOnFailure = True
     haltOnFailure = True
-    command = ['python', 'Tools/Scripts/clean-webkit']
+    command = ['python3', 'Tools/Scripts/clean-webkit']
 
     def __init__(self, **kwargs):
         super(CleanWorkingDirectory, self).__init__(logEnviron=False, **kwargs)
@@ -2782,7 +2782,7 @@
 
 
 class DownloadBuiltProduct(shell.ShellCommand):
-    command = ['python', 'Tools/CISupport/download-built-product',
+    command = ['python3', 'Tools/CISupport/download-built-product',
                WithProperties('--%(configuration)s'),
                WithProperties(S3URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
     name = 'download-built-product'
@@ -3073,7 +3073,7 @@
 
 
 class ArchiveTestResults(shell.ShellCommand):
-    command = ['python', 'Tools/CISupport/test-result-archive',
+    command = ['python3', 'Tools/CISupport/test-result-archive',
                Interpolate('--platform=%(prop:platform)s'), Interpolate('--%(prop:configuration)s'), 'archive']
     name = 'archive-test-results'
     description = ['archiving test results']

Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281939 => 281940)


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2021-09-02 18:35:22 UTC (rev 281940)
@@ -2565,7 +2565,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/clean-webkit'],
+                        command=['python3', 'Tools/Scripts/clean-webkit'],
                         )
             + 0,
         )
@@ -2577,7 +2577,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/clean-webkit'],
+                        command=['python3', 'Tools/Scripts/clean-webkit'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -2700,7 +2700,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/clean-webkit'],
+                        command=['python3', 'Tools/Scripts/clean-webkit'],
                         )
             + 0,
         )
@@ -2714,7 +2714,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/Scripts/clean-webkit'],
+                        command=['python3', 'Tools/Scripts/clean-webkit'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -2997,7 +2997,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/CISupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'],
+                        command=['python3', 'Tools/CISupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'],
                         )
             + 0,
         )
@@ -3013,7 +3013,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/CISupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'],
+                        command=['python3', 'Tools/CISupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -3601,7 +3601,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/CISupport/test-result-archive', '--platform=ios-simulator',  '--release', 'archive'],
+                        command=['python3', 'Tools/CISupport/test-result-archive', '--platform=ios-simulator',  '--release', 'archive'],
                         )
             + 0,
         )
@@ -3616,7 +3616,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/CISupport/test-result-archive', '--platform=mac',  '--debug', 'archive'],
+                        command=['python3', 'Tools/CISupport/test-result-archive', '--platform=mac',  '--debug', 'archive'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,

Modified: trunk/Tools/CISupport/test-result-archive (281939 => 281940)


--- trunk/Tools/CISupport/test-result-archive	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/test-result-archive	2021-09-02 18:35:22 UTC (rev 281940)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (C) 2009, 2015 Apple Inc.  All rights reserved.
 #

Modified: trunk/Tools/ChangeLog (281939 => 281940)


--- trunk/Tools/ChangeLog	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/ChangeLog	2021-09-02 18:35:22 UTC (rev 281940)
@@ -1,3 +1,22 @@
+2021-09-02  Aakash Jain  <aakash_j...@apple.com>
+
+        Move few scripts from python 2 to python3
+        https://bugs.webkit.org/show_bug.cgi?id=229817
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/clean-webkit: Changed shebang to python3.
+        * CISupport/test-result-archive: Ditto.
+        * CISupport/ews-build/steps.py: Ditto.
+        * CISupport/build-webkit-org/steps.py:
+        (DownloadBuiltProduct): Use python 3 instead of python 2.
+        (ArchiveTestResults): Ditto.
+        * CISupport/download-built-product: Ditto.
+        (CleanWorkingDirectory):
+        (DownloadBuiltProduct):
+        (ArchiveTestResults):
+        * CISupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2021-09-02  Jonathan Bedard  <jbed...@apple.com>
 
         [contributors.json] Relocation (Part 5)

Modified: trunk/Tools/Scripts/clean-webkit (281939 => 281940)


--- trunk/Tools/Scripts/clean-webkit	2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/Scripts/clean-webkit	2021-09-02 18:35:22 UTC (rev 281940)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (C) 2015 Canon Incorporated. All rights reserved.
 #

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to