Attachment #440663 for bug #231381

View Details Raw Unified Return to Bug 231381

| Differences between



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 NOBODY (OOPS!).

        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/webkitcorepy/__init__.py:
        * Scripts/webkitpy/__init__.py:

2021-10-08  Jonathan Bedard  <jbedard@apple.com>

        [contributors.json] Support GitHub usernames



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)))

AutoInstall.register(Package('wheel', Version(0, 35, 1)))
AutoInstall.register(Package('whichcraft', Version(0, 6, 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'

Lines 47-52 elif sys.version_info >= (2, 7) and sys.version_info < (3,): a/Tools/Scripts/webkitpy/__init__.py_sec1
- a/Tools/Scripts/webkitpy/__init__.py -1 / +5 lines
47	else:	47	else:
48	raise ImportError("Unsupported Python version! (%s)" % sys.version)	48	raise ImportError("Unsupported Python version! (%s)" % sys.version)
49		49
		50	if sys.version_info >= (3, 6):
		51	AutoInstall.register(Package('importlib_metadata', Version(4, 8, 1)))
		52	else:
		53	AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
		54
50	AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))	55	AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))
51	AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))	56	AutoInstall.register(Package('attr', Version(18, 1, 0), pypi_name='attrs'))
52	AutoInstall.register(Package('bs4', Version(4, 9, 3), pypi_name='beautifulsoup4'))	57	AutoInstall.register(Package('bs4', Version(4, 9, 3), pypi_name='beautifulsoup4'))
Lines 54-60 AutoInstall.register(Package('configparser', Version(4, 0, 2))) a/Tools/Scripts/webkitpy/__init__.py_sec2
54	AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))	59	AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))
55	AutoInstall.register(Package('coverage', Version(5, 2, 1)))	60	AutoInstall.register(Package('coverage', Version(5, 2, 1)))
56	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))	61	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
57	AutoInstall.register(Package('importlib_metadata', Version(1, 7, 0)))
58	AutoInstall.register(Package('genshi', Version(0, 7, 3), pypi_name='Genshi'))	62	AutoInstall.register(Package('genshi', Version(0, 7, 3), pypi_name='Genshi'))
59	AutoInstall.register(Package('html5lib', Version(1, 1)))	63	AutoInstall.register(Package('html5lib', Version(1, 1)))
60	AutoInstall.register(Package('iniconfig', Version(1, 1, 1)))	64	AutoInstall.register(Package('iniconfig', Version(1, 1, 1)))

Return to Bug 231381

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +22 lines
		1	2021-10-08 Michael Catanzaro <mcatanzaro@gnome.org>
		2
		3	Ensure webkitpy secret storage works successfully on Linux using only autoinstalled libraries
		4	https://bugs.webkit.org/show_bug.cgi?id=231381
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Update to the latest python-keyring and python-secretstorage when using python 3.6 or newer.
		9	Otherwise, use the latest version that still supports python2. This version is broken on
		10	Linux, but that's OK because we do not care about python2 or python 3.5 anymore. I'm just
		11	trying to avoid gratuitous breakage.
		12
		13	Autoinstall python-jeepey, a D-Bus library required by python-secretstorage.
		14
		15	Update to a newer version of importlib_metadata when using python 3.6 or newer. For older
		16	versions of python, stick to the older version. There are some API breaks in this library
		17	that I hope only affect python-keyring. We have other software that depends on this library,
		18	but I think it's OK with either version. test-webkitpy will be the arbiter of that.
		19
		20	* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
		21	* Scripts/webkitpy/__init__.py:
		22
1	2021-10-08 Jonathan Bedard <jbedard@apple.com>	23	2021-10-08 Jonathan Bedard <jbedard@apple.com>
2		24
3	[contributors.json] Support GitHub usernames	25	[contributors.json] Support GitHub usernames

Lines 61-67 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dat a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec1
- a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py -4 / +7 lines
61	AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))	61	AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
62	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))	62	AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
63	AutoInstall.register(Package('idna', Version(2, 10)))	63	AutoInstall.register(Package('idna', Version(2, 10)))
64	AutoInstall.register(Package('keyring', Version(7, 3, 1)))
65	AutoInstall.register(Package('packaging', Version(20, 4)))	64	AutoInstall.register(Package('packaging', Version(20, 4)))
66	AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))	65	AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
67	AutoInstall.register(Package('requests', Version(2, 24)))	66	AutoInstall.register(Package('requests', Version(2, 24)))
Lines 73-80 AutoInstall.register(Package('urllib3', Version(1, 25, 10))) a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py_sec2
73	AutoInstall.register(Package('wheel', Version(0, 35, 1)))	72	AutoInstall.register(Package('wheel', Version(0, 35, 1)))
74	AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))	73	AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
75		74
76	# This is needed for python-keyring.	75	if sys.version_info > (3, 6):
77	if sys.platform == 'linux':	76	if sys.platform == 'linux':
78	AutoInstall.register(Package('secretstorage', Version(2, 3, 1)))	77	AutoInstall.register(Package('jeepney', Version(0, 7, 1)))
		78	AutoInstall.register(Package('secretstorage', Version(3, 3, 1)))
		79	AutoInstall.register(Package('keyring', Version(23, 2, 1)))
		80	else:
		81	AutoInstall.register(Package('keyring', Version(18, 0, 1)))
79		82
80	name = 'webkitcorepy'	83	name = 'webkitcorepy'