Cherry-pick 271534@main (47c33f8). rdar://119145927

    Update rapidfuzz to 3.4.0
    https://bugs.webkit.org/show_bug.cgi?id=265809
    rdar://problem/119145927

    Reviewed by Jonathan Bedard.

    We keep on finding bots which need rapidfuzz to be reinstalled because
    the macOS universal2 wheel was broken
    (c.f. #19835). Let's mitigate this
    entire problem by just forcing rapidfuzz to be re-installed everywhere
    by upgrading it.

    I also found that 268494@main (ca3f26e) added pyparsing as an
    implicit_dep, which should actually be on packaging, as that's where the
    requirement actually is.

    * Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:
    * Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
    (AutoInstall):
    * Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py:

    Canonical link: https://commits.webkit.org/271534@main

Canonical link: https://commits.webkit.org/267815.648@safari-7617-branch

Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -77,9 +77,9 @@
 AutoInstall.register(Package('idna', Version(2, 10)))
 
 if sys.version_info > (3, 0):
-    AutoInstall.register(Package('packaging', Version(21, 3)))
+    AutoInstall.register(Package('packaging', Version(21, 3), implicit_deps=['pyparsing']))
 else:
-    AutoInstall.register(Package('packaging', Version(20, 4)))
+    AutoInstall.register(Package('packaging', Version(20, 4), implicit_deps=['pyparsing', 'six']))
 
 AutoInstall.register(Package('pyparsing', Version(2, 4, 7)))
 

Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py

@@ -459,7 +459,7 @@ class AutoInstall(object):
     CA_CERT_PATH_ENV_VAR = 'AUTOINSTALL_CA_CERT_PATH'
 
     # This list of libraries is required to install other libraries, and must be installed first
-    BASE_LIBRARIES = ['setuptools', 'wheel', 'pyparsing', 'packaging', 'setuptools_scm']
+    BASE_LIBRARIES = ['setuptools', 'wheel', 'six', 'pyparsing', 'packaging', 'setuptools_scm']
     if sys.version_info >= (3, 0):
         BASE_LIBRARIES.insert(-1, 'tomli')
 

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -56,8 +56,7 @@ def _maybe_add_webkitcorepy_path():
 AutoInstall.register(Package('webkitbugspy', Version(0, 8, 0)), local=True)
 
 if sys.version_info > (3, 6):
-    # FIXME: Remove wheel=False after upgrading past 2.15.1
-    AutoInstall.register(Package('rapidfuzz', Version(2, 11, 1), implicit_deps=['pyparsing'], wheel=False))
+    AutoInstall.register(Package('rapidfuzz', Version(3, 4, 0)))
 
 from webkitscmpy.contributor import Contributor
 from webkitscmpy.commit import Commit