Log Message
[webkitpy] Use webkitcorepy's auto installer for pytest packages https://bugs.webkit.org/show_bug.cgi?id=215895 <rdar://problem/67885471>
Rubber-stamped by Aakash Jain. * Scripts/webkitpy/__init__.py: Add pytest and it's dependencies. * Scripts/webkitpy/thirdparty/__init__.py: (AutoinstallImportHook.find_module): Remove pytest and pytest_timeout. (AutoinstallImportHook._install_pytest_timeout): Deleted. (AutoinstallImportHook._install_pytest): Deleted. * Scripts/webkitpy/webdriver_tests/pytest_runner.py: Implicitly use webkitcorepy's autoinstaller.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (267379 => 267380)
--- trunk/Tools/ChangeLog 2020-09-21 23:09:18 UTC (rev 267379)
+++ trunk/Tools/ChangeLog 2020-09-21 23:10:08 UTC (rev 267380)
@@ -1,3 +1,18 @@
+2020-09-21 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitpy] Use webkitcorepy's auto installer for pytest packages
+ https://bugs.webkit.org/show_bug.cgi?id=215895
+ <rdar://problem/67885471>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/webkitpy/__init__.py: Add pytest and it's dependencies.
+ * Scripts/webkitpy/thirdparty/__init__.py:
+ (AutoinstallImportHook.find_module): Remove pytest and pytest_timeout.
+ (AutoinstallImportHook._install_pytest_timeout): Deleted.
+ (AutoinstallImportHook._install_pytest): Deleted.
+ * Scripts/webkitpy/webdriver_tests/pytest_runner.py: Implicitly use webkitcorepy's autoinstaller.
+
2020-09-21 Jiewen Tan <jiewen_...@apple.com>
[WebAuthn] Don't set the UV option if the authenticator doesn't support it
Modified: trunk/Tools/Scripts/webkitpy/__init__.py (267379 => 267380)
--- trunk/Tools/Scripts/webkitpy/__init__.py 2020-09-21 23:09:18 UTC (rev 267379)
+++ trunk/Tools/Scripts/webkitpy/__init__.py 2020-09-21 23:10:08 UTC (rev 267380)
@@ -27,11 +27,26 @@
from webkitcorepy import AutoInstall, Package, Version
AutoInstall.set_directory(os.path.join(libraries, 'autoinstalled', 'python-{}'.format(sys.version_info[0])))
+AutoInstall.register(Package('atomicwrites', Version(1, 4, 0)))
+AutoInstall.register(Package('attr', Version(20, 1, 0), pypi_name='attrs'))
+AutoInstall.register(Package('configparser', Version(4, 0, 2)))
+AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))
AutoInstall.register(Package('coverage', Version(5, 2, 1)))
+AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
+AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
+AutoInstall.register(Package('more-itertools', Version(5, 0, 0)))
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('pathlib2', Version(2, 3, 5)))
+AutoInstall.register(Package('pluggy', Version(0, 13, 1)))
+AutoInstall.register(Package('py', Version(1, 9, 0)))
+AutoInstall.register(Package('pytest-timeout', Version(1, 4, 2)))
+AutoInstall.register(Package('pytest', Version(4, 6, 11)))
AutoInstall.register(Package('selenium', Version(3, 141, 0)))
AutoInstall.register(Package('toml', Version(0, 10, 1)))
+AutoInstall.register(Package('wcwidth', Version(0, 2, 5)))
+AutoInstall.register(Package('zipp', Version(1, 2, 0)))
+AutoInstall.register(Package('zope.interface', Version(5, 1, 0), pypi_name='zope-interface'))
AutoInstall.register(Package('webkitscmpy', Version(0, 0, 1)), local=True)
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (267379 => 267380)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-09-21 23:09:18 UTC (rev 267379)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2020-09-21 23:10:08 UTC (rev 267380)
@@ -109,10 +109,6 @@
self.install_chromedriver()
elif '.geckodriver' in fullname:
self.install_geckodriver()
- elif '.pytest_timeout' in fullname:
- self._install_pytest_timeout()
- elif '.pytest' in fullname:
- self._install_pytest()
elif '.bs4' in fullname:
self._install_beautifulsoup()
elif '.html5lib' in fullname:
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/pytest_runner.py (267379 => 267380)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/pytest_runner.py 2020-09-21 23:09:18 UTC (rev 267379)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/pytest_runner.py 2020-09-21 23:10:08 UTC (rev 267380)
@@ -29,8 +29,6 @@
from webkitpy.common.system.filesystem import FileSystem
from webkitpy.common.webkit_finder import WebKitFinder
-import webkitpy.thirdparty.autoinstalled.pytest
-import webkitpy.thirdparty.autoinstalled.pytest_timeout
import pytest
from _pytest.main import EXIT_INTERNALERROR
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
