Define an accurate set of aliases for each autoinstalled package

gsnedders · gsnedders · commit 082fbf947bdf · 2025-03-31T14:37:47.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=290598 Reviewed by Jonathan Bedard. * Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: * Tools/Scripts/webkitpy/__init__.py: * Tools/Scripts/webkitpy/autoinstalled/buildbot.py: Canonical link: https://commits.webkit.org/292966@main
diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
@@ -57,9 +57,9 @@
 from webkitcorepy.autoinstall import Package, AutoInstall
 
 if sys.version_info >= (3, 12):
-    AutoInstall.register(Package('setuptools', Version(68, 1, 2)))
+    AutoInstall.register(Package('setuptools', Version(68, 1, 2), aliases=['_distutils_hack', 'pkg_resources']))
 else:
-    AutoInstall.register(Package('setuptools', Version(59, 8, 0)))
+    AutoInstall.register(Package('setuptools', Version(59, 8, 0), aliases=['_distutils_hack', 'pkg_resources']))
 
 AutoInstall.register(Package('certifi', Version(2022, 12, 7)))
 AutoInstall.register(Package('chardet', Version(3, 0, 4)))
@@ -72,12 +72,12 @@
 AutoInstall.register(Package('requests', Version(2, 26, 0)))
 AutoInstall.register(Package('tomli', Version(2, 0, 1), wheel=True))
 AutoInstall.register(Package('setuptools_scm', Version(6, 4, 2), pypi_name='setuptools-scm', implicit_deps=['tomli']))
-AutoInstall.register(Package('socks', Version(1, 7, 1), pypi_name='PySocks'))
+AutoInstall.register(Package('socks', Version(1, 7, 1), pypi_name='PySocks', aliases=['sockshandler']))
 AutoInstall.register(Package('six', Version(1, 16, 0)))
 AutoInstall.register(Package('tblib', Version(1, 7, 0)))
 AutoInstall.register(Package('urllib3', Version(1, 26, 17)))
 AutoInstall.register(Package('wheel', Version(0, 35, 1)))
-AutoInstall.register(Package('cffi', Version(1, 17, 1)))
+AutoInstall.register(Package('cffi', Version(1, 17, 1), aliases=['_cffi_backend']))
 AutoInstall.register(Package('OpenSSL', Version(23, 2, 0), pypi_name='pyOpenSSL'))
 
 # There are no prebuilt binaries for arm-32 of 'cryptography' and building it requires cargo/rust
diff --git a/Tools/Scripts/webkitpy/__init__.py b/Tools/Scripts/webkitpy/__init__.py
@@ -59,7 +59,8 @@
 AutoInstall.register(
     Package("pytest", Version(7, 2, 0),
             implicit_deps=["attr", "pluggy", "iniconfig"]
-            + (["exceptiongroup"] if sys.version_info < (3, 11) else [])
+            + (["exceptiongroup"] if sys.version_info < (3, 11) else []),
+            aliases=["_pytest"]  # Technically also a stub "py" module, but this conflicts with the py project.
             )
 )
 AutoInstall.register(Package('pytest_asyncio', Version(0, 18, 3), pypi_name='pytest-asyncio', implicit_deps=['pytest'], wheel=True))
@@ -72,9 +73,9 @@
 AutoInstall.register(Package('importlib_metadata', Version(4, 8, 1)))
 AutoInstall.register(Package('typing_extensions', Version(4, 12, 2), wheel=True))
 AutoInstall.register(Package('atomicwrites', Version(1, 1, 5)))
-AutoInstall.register(Package('attr', Version(21, 3, 0), pypi_name='attrs'))
+AutoInstall.register(Package('attrs', Version(21, 3, 0), aliases=['attr']))
 AutoInstall.register(Package('bs4', Version(4, 12, 0), pypi_name='beautifulsoup4'))
-AutoInstall.register(Package('configparser', Version(4, 0, 2), implicit_deps=['pyparsing']))
+AutoInstall.register(Package('configparser', Version(4, 0, 2), implicit_deps=['pyparsing'], aliases=['backports.configparser']))
 AutoInstall.register(Package('contextlib2', Version(0, 6, 0)))
 AutoInstall.register(Package('coverage', Version(7, 6, 1), wheel=True))
 AutoInstall.register(Package('funcsigs', Version(1, 0, 2)))
@@ -86,7 +87,6 @@
 AutoInstall.register(Package('mozlog', Version(7, 1, 0), wheel=True))
 AutoInstall.register(Package('mozterm', Version(1, 0, 0)))
 AutoInstall.register(Package('pluggy', Version(0, 13, 1)))
-AutoInstall.register(Package('py', Version(1, 11, 0)))
 AutoInstall.register(Package('pycodestyle', Version(2, 5, 0)))
 AutoInstall.register(Package('pyfakefs', Version(5, 7, 3)))
 AutoInstall.register(Package('soupsieve', Version(2, 2, 1)))
diff --git a/Tools/Scripts/webkitpy/autoinstalled/buildbot.py b/Tools/Scripts/webkitpy/autoinstalled/buildbot.py
@@ -32,10 +32,10 @@
 AutoInstall.install('markupsafe')
 AutoInstall.install('jinja2')
 
-AutoInstall.install(Package('attr', Version(21, 3, 0), pypi_name='attrs'))
+AutoInstall.install(Package('attrs', Version(21, 3), aliases=['attr']))
 AutoInstall.install(Package('constantly', Version(15, 1, 0)))
-AutoInstall.install(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))
-AutoInstall.install(Package('future', Version(0, 18, 2)))
+AutoInstall.install(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil', wheel=True))
+AutoInstall.install(Package('future', Version(0, 18, 2), aliases=['libfuturize', 'libpasteurize', 'past']))
 AutoInstall.install(Package('pbr', Version(5, 9, 0)))
 AutoInstall.install(Package('lz4', Version(4, 3, 2)))
 AutoInstall.install(Package('jwt', Version(1, 7, 1), pypi_name='PyJWT'))
@@ -46,15 +46,15 @@
 AutoInstall.install(Package('decorator', Version(5, 1, 1)))
 AutoInstall.install(Package('hamcrest', Version(2, 0, 3), pypi_name='PyHamcrest'))
 AutoInstall.install(Package('sqlalchemy', Version(1, 3, 20), pypi_name='SQLAlchemy'))
-AutoInstall.install(Package('sqlalchemy-migrate', Version(0, 13, 0)))
+AutoInstall.install(Package('sqlalchemy_migrate', Version(0, 13, 0), pypi_name='sqlalchemy-migrate'))
 AutoInstall.install(Package('sqlparse', Version(0, 4, 2)))
 AutoInstall.install(Package('txaio', Version(20, 4, 1)))
 AutoInstall.install(Package('tempita', Version(0, 5, 2), pypi_name='Tempita'))
 
 # buildbot has wheel=False because we rely on items in buildbot.test that only
 # became public API and started being included in wheels from 3.5.0.
 AutoInstall.install(Package('buildbot', Version(2, 10, 5), wheel=False))
-AutoInstall.install(Package('buildbot-worker', Version(2, 10, 5)))
+AutoInstall.install(Package('buildbot_worker', Version(2, 10, 5), pypi_name='buildbot-worker'))
 
 
 sys.modules[__name__] = __import__('buildbot')
