Title: [267368] trunk/Tools
- Revision
- 267368
- Author
- [email protected]
- Date
- 2020-09-21 14:20:16 -0700 (Mon, 21 Sep 2020)
Log Message
[webkitpy] Use webkitcorepy's auto installer for moz* packages
https://bugs.webkit.org/show_bug.cgi?id=215889
<rdar://problem/67877935>
Rubber-stamped by Aakash Jain.
* Scripts/webkitpy/__init__.py: Add mozprocess, mozlog and mozterm to AutoInstalled packages.
* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook.find_module): Remove mozlog and mozprocess.
(AutoinstallImportHook._install_mozlog): Deleted.
(AutoinstallImportHook._install_mozprocess): Deleted.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py: Implicitly use webkitcorepy's auto-installer.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (267367 => 267368)
--- trunk/Tools/ChangeLog 2020-09-21 21:17:46 UTC (rev 267367)
+++ trunk/Tools/ChangeLog 2020-09-21 21:20:16 UTC (rev 267368)
@@ -1,5 +1,20 @@
2020-09-21 Jonathan Bedard <[email protected]>
+ [webkitpy] Use webkitcorepy's auto installer for moz* packages
+ https://bugs.webkit.org/show_bug.cgi?id=215889
+ <rdar://problem/67877935>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/webkitpy/__init__.py: Add mozprocess, mozlog and mozterm to AutoInstalled packages.
+ * Scripts/webkitpy/thirdparty/__init__.py:
+ (AutoinstallImportHook.find_module): Remove mozlog and mozprocess.
+ (AutoinstallImportHook._install_mozlog): Deleted.
+ (AutoinstallImportHook._install_mozprocess): Deleted.
+ * Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py: Implicitly use webkitcorepy's auto-installer.
+
+2020-09-21 Jonathan Bedard <[email protected]>
+
[webkitpy] Use webkitcorepy's auto installer for six
https://bugs.webkit.org/show_bug.cgi?id=215770
<rdar://problem/67683133>
Modified: trunk/Tools/Scripts/webkitpy/__init__.py (267367 => 267368)
--- trunk/Tools/Scripts/webkitpy/__init__.py 2020-09-21 21:17:46 UTC (rev 267367)
+++ trunk/Tools/Scripts/webkitpy/__init__.py 2020-09-21 21:20:16 UTC (rev 267368)
@@ -28,6 +28,9 @@
AutoInstall.set_directory(os.path.join(libraries, 'autoinstalled', 'python-{}'.format(sys.version_info[0])))
AutoInstall.register(Package('coverage', Version(5, 2, 1)))
+AutoInstall.register(Package('mozprocess', Version(1, 2, 0)))
+AutoInstall.register(Package('mozlog', Version(6, 1)))
+AutoInstall.register(Package('mozterm', Version(1, 0, 0)))
AutoInstall.register(Package('selenium', Version(3, 141, 0)))
AutoInstall.register(Package('toml', Version(0, 10, 1)))
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (267367 => 267368)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-09-21 21:17:46 UTC (rev 267367)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-09-21 21:20:16 UTC (rev 267368)
@@ -109,10 +109,6 @@
self.install_chromedriver()
elif '.geckodriver' in fullname:
self.install_geckodriver()
- elif '.mozlog' in fullname:
- self._install_mozlog()
- elif '.mozprocess' in fullname:
- self._install_mozprocess()
elif '.pytest_timeout' in fullname:
self._install_pytest_timeout()
elif '.pytest' in fullname:
@@ -143,18 +139,6 @@
self._install("https://files.pythonhosted.org/packages/source/p/pycodestyle/pycodestyle-2.5.0.tar.gz",
"pycodestyle-2.5.0/pycodestyle.py")
- def _install_mozlog(self):
- self._ensure_autoinstalled_dir_is_in_sys_path()
- self._install("https://files.pythonhosted.org/packages/a0/69/5ff6001df98cf1894e6fb4aa74eda1504f830515e52fc6b0a3acc8c1a788/mozterm-1.0.0.tar.gz",
- "mozterm-1.0.0/mozterm")
- self._install("https://files.pythonhosted.org/packages/6b/7d/30d52c3b2cc022280c41f47f0499afc6d87116b23051bf69c683aaa1cdcb/mozlog-5.0.tar.gz",
- "mozlog-5.0/mozlog")
-
- def _install_mozprocess(self):
- self._ensure_autoinstalled_dir_is_in_sys_path()
- self._install("https://files.pythonhosted.org/packages/97/e7/7907f0bf2d0b42b154741f8ff63a199486fc67c90aac88cde5f2d1ad1ea2/mozprocess-1.1.0.tar.gz",
- "mozprocess-1.1.0/mozprocess")
-
def _install_pytest_timeout(self):
self._install("https://files.pythonhosted.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz",
"pytest-timeout-1.2.0/pytest_timeout.py")
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py (267367 => 267368)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py 2020-09-21 21:17:46 UTC (rev 267367)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py 2020-09-21 21:20:16 UTC (rev 267368)
@@ -28,8 +28,7 @@
from multiprocessing import Process, Queue
from webkitpy.common.system.filesystem import FileSystem
from webkitpy.common.webkit_finder import WebKitFinder
-import webkitpy.thirdparty.autoinstalled.mozlog
-import webkitpy.thirdparty.autoinstalled.mozprocess
+
from mozlog import structuredlog
w3c_tools_dir = WebKitFinder(FileSystem()).path_from_webkit_base('WebDriverTests', 'imported', 'w3c', 'tools')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
