Attachment 418033 Details for Bug 220792 – Patch

[patch] Patch

bug-220792-20210121145058.patch (text/plain), 4.57 KB, created by Angelos Oikonomopoulos on 2021-01-21 05:51:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Angelos Oikonomopoulos

Created: 2021-01-21 05:51:02 PST

Size: 4.57 KB

patch

obsolete

>Subversion Revision: 271688
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 0d2b9e4453c761857f4e4a2ce1a9d64f64f30007..918b0c0562717dd1946a3137673d697966477530 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2021-01-21  Angelos Oikonomopoulos  <angelos@igalia.com>
>+
>+        [webkitcorepy] Use AutoInstall for webkitcorepy deps as well
>+        https://bugs.webkit.org/show_bug.cgi?id=220792
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Call AutoInstall.set_directory in webkitcorepy/__init__.py, so
>+        that it can also be used for dependencies by sibling files in the
>+        same directory.  Fixes a regression after
>+        1d342a5067e22ac8069ff3ff337b2d58e1d06517, where task_pool.py uses
>+        the six module without it being installed.
>+
>+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
>+        * Scripts/webkitpy/__init__.py:
>+
> 2021-01-20  Jonathan Bedard  <jbedard@apple.com>
> 
>         [webkitscmpy] Gracefully handle missing keyring backend
>diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>index 0ad0cf4cdfc9ad919416fd1de3b5b1fda273786b..f90a5043aefce0e91df4b8334e3a12665fc918fb 100644
>--- a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>+++ b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>@@ -21,6 +21,7 @@
> # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> import logging
>+import os
> import platform
> import sys
> 
>@@ -29,16 +30,21 @@ from logging import NullHandler
> log = logging.getLogger('webkitcorepy')
> log.addHandler(NullHandler())
> 
>+libraries = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
>+if sys.platform == 'darwin':
>+    is_root = not os.getuid()
>+    does_own_libraries = os.stat(libraries).st_uid == os.getuid()
>+    if (is_root or not does_own_libraries):
>+        libraries = os.path.expanduser('~/Library/webkitpy')
>+
>+from webkitcorepy.autoinstall import Package, AutoInstall
> from webkitcorepy.version import Version
>-from webkitcorepy.string_utils import BytesIO, StringIO, UnicodeIO, unicode
>-from webkitcorepy.timeout import Timeout
>-from webkitcorepy.subprocess_utils import TimeoutExpired, CompletedProcess, run
>-from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
>-from webkitcorepy.task_pool import TaskPool
>+
>+AutoInstall.set_directory(os.path.join(libraries, 'autoinstalled', 'python-{}'.format(sys.version_info[0])))
>+AutoInstall.register(Package('six', Version(1, 15, 0)))
> 
> version = Version(0, 5, 0)
> 
>-from webkitcorepy.autoinstall import Package, AutoInstall
> if sys.version_info > (3, 0):
>     AutoInstall.register(Package('mock', Version(4)))
> else:
>@@ -55,9 +61,14 @@ AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
> AutoInstall.register(Package('requests', Version(2, 24)))
> AutoInstall.register(Package('setuptools', Version(44, 1,  1)))
> AutoInstall.register(Package('socks', Version(1, 7, 1), pypi_name='PySocks'))
>-AutoInstall.register(Package('six', Version(1, 15, 0)))
> AutoInstall.register(Package('tblib', Version(1, 7, 0)))
> AutoInstall.register(Package('urllib3', Version(1, 25, 10)))
> AutoInstall.register(Package('wheel', Version(0, 35, 1)))
> 
>+from webkitcorepy.string_utils import BytesIO, StringIO, UnicodeIO, unicode
>+from webkitcorepy.timeout import Timeout
>+from webkitcorepy.subprocess_utils import TimeoutExpired, CompletedProcess, run
>+from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
>+from webkitcorepy.task_pool import TaskPool
>+
> name = 'webkitcorepy'
>diff --git a/Tools/Scripts/webkitpy/__init__.py b/Tools/Scripts/webkitpy/__init__.py
>index 8206d1581c32d615353b081b5ae72d863ced3b05..63a8dc44d2d20461e3bd11b9447371edd69a21c0 100644
>--- a/Tools/Scripts/webkitpy/__init__.py
>+++ b/Tools/Scripts/webkitpy/__init__.py
>@@ -21,14 +21,7 @@ os.environ['SYSTEM_VERSION_COMPAT'] = '0'
> libraries = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(__file__))), 'libraries')
> sys.path.insert(0, os.path.join(libraries, 'webkitcorepy'))
> 
>-if sys.platform == 'darwin':
>-    is_root = not os.getuid()
>-    does_own_libraries = os.stat(libraries).st_uid == os.getuid()
>-    if (is_root or not does_own_libraries):
>-        libraries = os.path.expanduser('~/Library/webkitpy')
>-
> 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, 1, 5)))
> AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))

Flags:

jbedard: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 220792: 418033