Changeset 250998 in webkit

Timestamp:

Oct 10, 2019, 6:50:31 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

New html5lib requires newer version of six.py than that shipped in macOS 10.14.6
​https://bugs.webkit.org/show_bug.cgi?id=202830

Autoinstall six along with html5lib.

Patch by Kenneth Russell <​kbr@chromium.org> on 2019-10-10
Reviewed by Jonathan Bedard.

• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook._install_mechanize):
(AutoinstallImportHook._install_pytest):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-10  Kenneth Russell  <kbr@chromium.org>
+
+        New html5lib requires newer version of six.py than that shipped in macOS 10.14.6
+        https://bugs.webkit.org/show_bug.cgi?id=202830
+
+        Autoinstall six along with html5lib.
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook._install_mechanize):
+        (AutoinstallImportHook._install_pytest):
+
 2019-10-10  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

@@ -126 +126 @@
             self._install_requests()
 
+    def _install_six(self):
+        self._install("https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz",
+                              "six-1.11.0/six.py")
+
     def _install_mechanize(self):
         self._ensure_autoinstalled_dir_is_in_sys_path()
@@ -134 +138 @@
         self._install("https://files.pythonhosted.org/packages/64/f1/1aa4c96dea14e17a955019b0fc4ac1b8dfbc50e3c90970c1fb8882e74a7b/mechanize-0.4.3.tar.gz",
                              "mechanize-0.4.3/mechanize")
+        self._install_six()
 
     def _install_keyring(self):
@@ -167 +172 @@
         self._install("https://files.pythonhosted.org/packages/c0/2f/6773347277d76c5ade4414a6c3f785ef27e7f5c4b0870ec7e888e66a8d83/more-itertools-4.2.0.tar.gz",
                               "more-itertools-4.2.0/more_itertools")
-        self._install("https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz",
-                              "six-1.11.0/six.py")
+        self._install_six()
         self._install("https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz",
                               "atomicwrites-1.1.5/atomicwrites")