Modified: trunk/Tools/ChangeLog (265349 => 265350)
--- trunk/Tools/ChangeLog 2020-08-06 22:11:04 UTC (rev 265349)
+++ trunk/Tools/ChangeLog 2020-08-06 22:41:49 UTC (rev 265350)
@@ -1,3 +1,14 @@
+2020-08-06 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitcorepy] Standardize setuptools version
+ https://bugs.webkit.org/show_bug.cgi?id=215234
+ <rdar://problem/66638187>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Use the same setuptools version
+ for Python 2 and 3.
+
2020-08-06 Wenson Hsieh <wenson_hs...@apple.com>
Unreviewed, reverting r265325.
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (265349 => 265350)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2020-08-06 22:11:04 UTC (rev 265349)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2020-08-06 22:41:49 UTC (rev 265350)
@@ -29,15 +29,13 @@
from webkitcorepy.version import Version
from webkitcorepy.string_utils import BytesIO, StringIO, UnicodeIO, unicode
-version = Version(0, 1, 1)
+version = Version(0, 1, 2)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
AutoInstall.register(Package('mock', Version(4)))
- AutoInstall.register(Package('setuptools', Version(41, 2, 0)))
else:
AutoInstall.register(Package('mock', Version(3, 0, 5)))
- AutoInstall.register(Package('setuptools', Version(41, 0, 1)))
if platform.system() == 'Windows':
AutoInstall.register(Package('win_inet_pton', Version(1, 1, 0), pypi_name='win-inet-pton'))
@@ -46,5 +44,6 @@
AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
AutoInstall.register(Package('idna', Version(2, 10)))
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('urllib3', Version(1, 25, 10)))
