Attachment 440675 Details for Bug 231381 – Patch

[patch] Patch

bug-231381-20211008164348.patch (text/plain), 5.34 KB, created by Michael Catanzaro on 2021-10-08 14:43:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2021-10-08 14:43:49 PDT

Size: 5.34 KB

patch

obsolete

>Subversion Revision: 283838
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e061fdf0407a797725087aafbc9ca0053f7fc116..b7a5b40e2d81b76e2d4ac4bd967ce6a428bf745b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2021-10-08  Michael Catanzaro  <mcatanzaro@gnome.org>
>+
>+        Ensure webkitpy secret storage works successfully on Linux using only autoinstalled libraries
>+        https://bugs.webkit.org/show_bug.cgi?id=231381
>+
>+        Reviewed by Jonathan Bedard.
>+
>+        Update to the latest python-keyring and python-secretstorage when using python 3.6 or newer.
>+        Otherwise, use the latest version that still supports python2. This version is broken on
>+        Linux, but that's OK because we do not care about python2 or python 3.5 anymore. I'm just
>+        trying to avoid gratuitous breakage.
>+
>+        Autoinstall python-jeepey, a D-Bus library required by python-secretstorage.
>+
>+        Update to a newer version of importlib_metadata when using python 3.6 or newer. For older
>+        versions of python, stick to the older version. There are some API breaks in this library
>+        that I hope only affect python-keyring. We have other software that depends on this library,
>+        but I think it's OK with either version. test-webkitpy will be the arbiter of that.
>+
>+        * Scripts/libraries/webkitcorepy/setup.py:
>+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
>+        * Scripts/webkitpy/__init__.py:
>+
> 2021-10-08  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][MiniBrowser][WK2] Implement Show Layer Tree to dump the GraphicsLayer tree
>diff --git a/Tools/Scripts/libraries/webkitcorepy/setup.py b/Tools/Scripts/libraries/webkitcorepy/setup.py
>index ef26812627b3880cff8a8e4d621afcd87a743548..6b8055ddb80c20fa53daf42c143573c04a73f3b8 100644
>--- a/Tools/Scripts/libraries/webkitcorepy/setup.py
>+++ b/Tools/Scripts/libraries/webkitcorepy/setup.py
>@@ -30,7 +30,7 @@ def readme():
> 
> setup(
>     name='webkitcorepy',
>-    version='0.11.2',
>+    version='0.11.3',
>     description='Library containing various Python support classes and functions.',
>     long_description=readme(),
>     classifiers=[
>diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>index 6072c46688e5d97618aedcc0068e2ced9c5798bd..ddfdb2d57b54b963080356318a27b69519e13012 100644
>--- a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>+++ b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>@@ -43,7 +43,7 @@ from webkitcorepy.call_by_need import CallByNeed
> from webkitcorepy.editor import Editor
> from webkitcorepy.file_lock import FileLock
> 
>-version = Version(0, 11, 2)
>+version = Version(0, 11, 3)
> 
> from webkitcorepy.autoinstall import Package, AutoInstall
> if sys.version_info > (3, 0):
>@@ -61,7 +61,6 @@ AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dat
> AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
> AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
> AutoInstall.register(Package('idna', Version(2, 10)))
>-AutoInstall.register(Package('keyring', Version(7, 3, 1)))
> AutoInstall.register(Package('packaging', Version(20, 4)))
> AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
> AutoInstall.register(Package('requests', Version(2, 24)))
>@@ -73,8 +72,12 @@ AutoInstall.register(Package('urllib3', Version(1, 25, 10)))
> AutoInstall.register(Package('wheel', Version(0, 35, 1)))
> AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
> 
>-# This is needed for python-keyring.
>-if sys.platform == 'linux':
>-    AutoInstall.register(Package('secretstorage', Version(2, 3, 1)))
>+if sys.version_info >= (3, 6):
>+    if sys.platform == 'linux':
>+        AutoInstall.register(Package('jeepney', Version(0, 7, 1)))
>+        AutoInstall.register(Package('secretstorage', Version(3, 3, 1)))
>+    AutoInstall.register(Package('keyring', Version(23, 2, 1)))
>+else:
>+    AutoInstall.register(Package('keyring', Version(18, 0, 1)))
> 
> name = 'webkitcorepy'
>diff --git a/Tools/Scripts/webkitpy/__init__.py b/Tools/Scripts/webkitpy/__init__.py
>index 47a78b0a481be406a500a2124123baeab8506cab..44a16b29efde2e2fcc573a115d7cba8c6f738e98 100644
>--- a/Tools/Scripts/webkitpy/__init__.py
>+++ b/Tools/Scripts/webkitpy/__init__.py
>@@ -47,6 +47,11 @@ elif sys.version_info >= (2, 7) and sys.version_info < (3,):
> else:
>     raise ImportError("Unsupported Python version! (%s)" % sys.version)
> 
>+if sys.version_info >= (3, 6):
>+    AutoInstall.register(Package('importlib_metadata', Version(4, 8, 1)))
>+else:
>+    AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
>+
> AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))
> AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))
> AutoInstall.register(Package('bs4', Version(4, 9, 3), pypi_name='beautifulsoup4'))
>@@ -54,7 +59,6 @@ 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('genshi', Version(0, 7, 3), pypi_name='Genshi'))
> AutoInstall.register(Package('html5lib', Version(1, 1)))
> AutoInstall.register(Package('iniconfig', Version(1, 1, 1)))

Actions: View | Formatted Diff | Diff

Attachments on bug 231381: 440525 | 440659 | 440661 | 440663 | 440675