Modified: trunk/Tools/ChangeLog (274985 => 274986)
--- trunk/Tools/ChangeLog 2021-03-25 00:05:48 UTC (rev 274985)
+++ trunk/Tools/ChangeLog 2021-03-25 00:24:39 UTC (rev 274986)
@@ -1,3 +1,16 @@
+2021-03-24 Jonathan Bedard <[email protected]>
+
+ Autoinstalling keyring-7.3.1 is failing with Python 2
+ https://bugs.webkit.org/show_bug.cgi?id=223677
+ <rdar://problem/75800504>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version, add setuptools_scm.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (Package.install): Always install setuptools_scm.
+
2021-03-24 Chris Fleizach <[email protected]>
AX: Add functions rectsForTextMarkerRange for testing
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (274985 => 274986)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-03-25 00:05:48 UTC (rev 274985)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-03-25 00:24:39 UTC (rev 274986)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.5.6',
+ version='0.5.7',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (274985 => 274986)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-03-25 00:05:48 UTC (rev 274985)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-03-25 00:24:39 UTC (rev 274986)
@@ -37,7 +37,7 @@
from webkitcorepy.task_pool import TaskPool
from webkitcorepy.credentials import credentials
-version = Version(0, 5, 6)
+version = Version(0, 5, 7)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
@@ -57,7 +57,8 @@
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('setuptools', Version(44, 1, 1)))
+AutoInstall.register(Package('setuptools', Version(44, 1, 1)))
+AutoInstall.register(Package('setuptools_scm', Version(5, 0, 2), pypi_name='setuptools-scm'))
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)))
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (274985 => 274986)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-03-25 00:05:48 UTC (rev 274985)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-03-25 00:24:39 UTC (rev 274986)
@@ -232,9 +232,10 @@
if self.is_cached():
return
- # Make sure that setuptools and wheel are installed, since setup.py relies on it
- if self.name not in ['setuptools', 'wheel']:
+ # Make sure that setuptools, setuptools_scm and wheel are installed, since setup.py relies on it
+ if self.name not in ['setuptools', 'setuptools_scm', 'wheel']:
AutoInstall.install('setuptools')
+ AutoInstall.install('setuptools_scm')
AutoInstall.install('wheel')
# In some cases a package may check if another package is installed without actually
