- Revision
- 283843
- Author
- [email protected]
- Date
- 2021-10-08 15:21:19 -0700 (Fri, 08 Oct 2021)
Log Message
Ensure webkitpy secret storage works successfully on Linux using only autoinstalled libraries
https://bugs.webkit.org/show_bug.cgi?id=231381
Patch by Michael Catanzaro <[email protected]> on 2021-10-08
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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283842 => 283843)
--- trunk/Tools/ChangeLog 2021-10-08 22:19:40 UTC (rev 283842)
+++ trunk/Tools/ChangeLog 2021-10-08 22:21:19 UTC (rev 283843)
@@ -1,3 +1,26 @@
+2021-10-08 Michael Catanzaro <[email protected]>
+
+ 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 <[email protected]>
[Win][MiniBrowser][WK2] Implement Show Layer Tree to dump the GraphicsLayer tree
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (283842 => 283843)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-10-08 22:19:40 UTC (rev 283842)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-10-08 22:21:19 UTC (rev 283843)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.11.2',
+ version='0.11.3',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (283842 => 283843)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-10-08 22:19:40 UTC (rev 283842)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-10-08 22:21:19 UTC (rev 283843)
@@ -43,7 +43,7 @@
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('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('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'
Modified: trunk/Tools/Scripts/webkitpy/__init__.py (283842 => 283843)
--- trunk/Tools/Scripts/webkitpy/__init__.py 2021-10-08 22:19:40 UTC (rev 283842)
+++ trunk/Tools/Scripts/webkitpy/__init__.py 2021-10-08 22:21:19 UTC (rev 283843)
@@ -47,6 +47,11 @@
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('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)))
