Merge branch 'main' into pyright-initial-config

pkg_resources/__init__.py

@@ -3193,7 +3193,7 @@ def _find_adapter(registry, ob):
     for t in types:
         if t in registry:
             return registry[t]
-    # _find_adapter would previously return None, and immediatly be called.
+    # _find_adapter would previously return None, and immediately be called.
     # So we're raising a TypeError to keep backward compatibility if anyone depended on that behaviour.
     raise TypeError(f"Could not find adapter for {registry} and {ob}")
 

setup.py

@@ -88,6 +88,6 @@ def _restore_install_lib(self):
 
 if __name__ == '__main__':
     # allow setup.py to run from another directory
-    # TODO: Use a proper conditonal statement here
+    # TODO: Use a proper conditional statement here
     here and os.chdir(here)  # type: ignore[func-returns-value]
     dist = setuptools.setup(**setup_params)