Changeset 267728 in webkit

Timestamp:

Sep 28, 2020, 11:25:46 PM (6 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Use webkitcorepy's auto installer for pycodestyle (Follow-up fix)
​https://bugs.webkit.org/show_bug.cgi?id=215427
<rdar://problem/66931291>

Unreviewed follow-up fix.

Conflict resolution at some point broke the original change.

• Scripts/webkitpy/style/checkers/python.py: Import directly from pycodestyle.
• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook._install_pycodestyle): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/python.py (modified) (1 diff)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-28  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Use webkitcorepy's auto installer for pycodestyle (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=215427
+        <rdar://problem/66931291>
+
+        Unreviewed follow-up fix.
+
+        Conflict resolution at some point broke the original change.
+
+        * Scripts/webkitpy/style/checkers/python.py: Import directly from pycodestyle.
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook._install_pycodestyle): Deleted.
+
 2020-09-28  Mark Lam  <mark.lam@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/python.py

@@ -31 +31 @@
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.webkit_finder import WebKitFinder
-from webkitpy.thirdparty.autoinstalled import pycodestyle
+
+import pycodestyle
 
 from webkitcorepy import OutputCapture

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

@@ -134 +134 @@
                              "keyring-7.3.1/keyring")
 
-    def _install_pycodestyle(self):
-        self._install("https://files.pythonhosted.org/packages/source/p/pycodestyle/pycodestyle-2.5.0.tar.gz",
-                             "pycodestyle-2.5.0/pycodestyle.py")
-
     def _install_pytest_timeout(self):
         self._install("https://files.pythonhosted.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz",