Bump ruff to v0.5.0 and pyright to v1.1.369 (#9801)

sydney-runkle · sydney-runkle · commit 2a066a26f751 · 2024-07-03T18:25:37.000-04:00
diff --git a/.github/actions/people/people.py b/.github/actions/people/people.py
@@ -3,7 +3,7 @@
 This logic is inspired by that of @tiangolo's
 [FastAPI people script](https://github.com/tiangolo/fastapi/blob/master/.github/actions/people/app/main.py).
 """
-import requests
+
 import logging
 import subprocess
 import sys
@@ -12,12 +12,14 @@
 from pathlib import Path
 from typing import Any, Container, Dict, List, Set, Union
 
+import requests
 import yaml
 from github import Github
-from pydantic import BaseModel, SecretStr
 from pydantic_settings import BaseSettings
 
-github_graphql_url = "https://api.github.com/graphql"
+from pydantic import BaseModel, SecretStr
+
+github_graphql_url = 'https://api.github.com/graphql'
 
 discussions_query = """
 query Q($after: String) {
@@ -287,7 +289,7 @@ class PRsResponse(BaseModel):
 
 class Settings(BaseSettings):
     input_token: SecretStr
-    github_repository: str = "pydantic/pydantic"
+    github_repository: str = 'pydantic/pydantic'
     request_timeout: int = 30
 
 
@@ -297,24 +299,22 @@ def get_graphql_response(
     query: str,
     after: Union[str, None] = None,
 ) -> Dict[str, Any]:
-    headers = {"Authorization": f"token {settings.input_token.get_secret_value()}"}
-    variables = {"after": after}
+    headers = {'Authorization': f'token {settings.input_token.get_secret_value()}'}
+    variables = {'after': after}
     response = requests.post(
         github_graphql_url,
         headers=headers,
         timeout=settings.request_timeout,
-        json={"query": query, "variables": variables, "operationName": "Q"},
+        json={'query': query, 'variables': variables, 'operationName': 'Q'},
     )
     if response.status_code != 200:
-        logging.error(
-            f"Response was not 200, after: {after}"
-        )
+        logging.error(f'Response was not 200, after: {after}')
         logging.error(response.text)
         raise RuntimeError(response.text)
     data = response.json()
-    if "errors" in data:
-        logging.error(f"Errors in response, after: {after}")
-        logging.error(data["errors"])
+    if 'errors' in data:
+        logging.error(f'Errors in response, after: {after}')
+        logging.error(data['errors'])
         logging.error(response.text)
         raise RuntimeError(response.text)
     return data
@@ -390,9 +390,7 @@ def get_discussions_experts(settings: Settings):
         for discussion_edge in discussion_edges:
             discussion_nodes.append(discussion_edge.node)
         last_edge = discussion_edges[-1]
-        discussion_edges = get_graphql_question_discussion_edges(
-            settings=settings, after=last_edge.cursor
-        )
+        discussion_edges = get_graphql_question_discussion_edges(settings=settings, after=last_edge.cursor)
 
     commentors = Counter()
     last_month_commentors = Counter()
@@ -483,7 +481,7 @@ def get_contributors(settings: Settings):
                 pr_reviewers.add(review.author.login)
         for reviewer in pr_reviewers:
             reviewers[reviewer] += 1
-        if pr.state == "MERGED" and pr.author:
+        if pr.state == 'MERGED' and pr.author:
             contributors[pr.author.login] += 1
     return contributors, commentors, reviewers, authors
 
@@ -503,40 +501,45 @@ def get_top_users(
             author = authors[commentor]
             users.append(
                 {
-                    "login": commentor,
-                    "count": count,
-                    "avatarUrl": author.avatarUrl,
-                    "url": author.url,
+                    'login': commentor,
+                    'count': count,
+                    'avatarUrl': author.avatarUrl,
+                    'url': author.url,
                 }
             )
     return users
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
     settings = Settings()
-    logging.info(f"Using config: {settings.model_dump_json()}")
+    logging.info(f'Using config: {settings.model_dump_json()}')
     g = Github(settings.input_token.get_secret_value())
     repo = g.get_repo(settings.github_repository)
-    question_commentors, question_last_month_commentors, question_authors = get_experts(
-        settings=settings
-    )
-    contributors, pr_commentors, reviewers, pr_authors = get_contributors(
-        settings=settings
-    )
+    question_commentors, question_last_month_commentors, question_authors = get_experts(settings=settings)
+    contributors, pr_commentors, reviewers, pr_authors = get_contributors(settings=settings)
     authors = {**question_authors, **pr_authors}
-    maintainers_logins = {'samuelcolvin', 'adriangb', 'dmontagu', 'hramezani', 'Kludex', 'davidhewitt', 'sydney-runkle', 'alexmojaki'}
-    bot_names = {"codecov", "github-actions", "pre-commit-ci", "dependabot"}
+    maintainers_logins = {
+        'samuelcolvin',
+        'adriangb',
+        'dmontagu',
+        'hramezani',
+        'Kludex',
+        'davidhewitt',
+        'sydney-runkle',
+        'alexmojaki',
+    }
+    bot_names = {'codecov', 'github-actions', 'pre-commit-ci', 'dependabot'}
     maintainers = []
     for login in maintainers_logins:
         user = authors[login]
         maintainers.append(
             {
-                "login": login,
-                "answers": question_commentors[login],
-                "prs": contributors[login],
-                "avatarUrl": user.avatarUrl,
-                "url": user.url,
+                'login': login,
+                'answers': question_commentors[login],
+                'prs': contributors[login],
+                'avatarUrl': user.avatarUrl,
+                'url': user.url,
             }
         )
 
@@ -572,53 +575,45 @@ def get_top_users(
 
     extra_experts = [
         {
-            "login": "ybressler",
-            "count": None,
-            "avatarUrl": "https://avatars.githubusercontent.com/u/40807730?v=4",
-            "url": "https://github.com/ybressler"
+            'login': 'ybressler',
+            'count': None,
+            'avatarUrl': 'https://avatars.githubusercontent.com/u/40807730?v=4',
+            'url': 'https://github.com/ybressler',
         },
     ]
-    expert_logins = {e["login"] for e in experts}
-    experts.extend([expert for expert in extra_experts if expert["login"] not in expert_logins])
+    expert_logins = {e['login'] for e in experts}
+    experts.extend([expert for expert in extra_experts if expert['login'] not in expert_logins])
 
     people = {
-        "maintainers": maintainers,
-        "experts": experts,
-        "last_month_active": last_month_active,
-        "top_contributors": top_contributors,
-        "top_reviewers": top_reviewers,
+        'maintainers': maintainers,
+        'experts': experts,
+        'last_month_active': last_month_active,
+        'top_contributors': top_contributors,
+        'top_reviewers': top_reviewers,
     }
-    people_path = Path("./docs/plugins/people.yml")
-    people_old_content = people_path.read_text(encoding="utf-8")
-    new_people_content = yaml.dump(
-        people, sort_keys=False, width=200, allow_unicode=True
-    )
-    if (
-        people_old_content == new_people_content
-    ):
+    people_path = Path('./docs/plugins/people.yml')
+    people_old_content = people_path.read_text(encoding='utf-8')
+    new_people_content = yaml.dump(people, sort_keys=False, width=200, allow_unicode=True)
+    if people_old_content == new_people_content:
         logging.info("The Pydantic People data hasn't changed, finishing.")
         sys.exit(0)
-    people_path.write_text(new_people_content, encoding="utf-8")
-
-    logging.info("Setting up GitHub Actions git user")
-    subprocess.run(["git", "config", "user.name", "github-actions"], check=True)
-    subprocess.run(
-        ["git", "config", "user.email", "github-actions@github.com"], check=True
-    )
-
-    branch_name = "pydantic-people-update"
-    logging.info(f"Creating a new branch {branch_name}")
-    subprocess.run(["git", "checkout", "-b", branch_name], check=True)
-    logging.info("Adding updated file")
-    subprocess.run(
-        ["git", "add", str(people_path)], check=True
-    )
-    logging.info("Committing updated file")
-    message = "👥 Update Pydantic People"
-    result = subprocess.run(["git", "commit", "-m", message], check=True)
-    logging.info("Pushing branch")
-    subprocess.run(["git", "push", "origin", branch_name], check=True)
-    logging.info("Creating PR")
-    pr = repo.create_pull(title=message, body=message, base="main", head=branch_name)
-    logging.info(f"Created PR: {pr.number}")
-    logging.info("Finished")
+    people_path.write_text(new_people_content, encoding='utf-8')
+
+    logging.info('Setting up GitHub Actions git user')
+    subprocess.run(['git', 'config', 'user.name', 'github-actions'], check=True)
+    subprocess.run(['git', 'config', 'user.email', 'github-actions@github.com'], check=True)
+
+    branch_name = 'pydantic-people-update'
+    logging.info(f'Creating a new branch {branch_name}')
+    subprocess.run(['git', 'checkout', '-b', branch_name], check=True)
+    logging.info('Adding updated file')
+    subprocess.run(['git', 'add', str(people_path)], check=True)
+    logging.info('Committing updated file')
+    message = '👥 Update Pydantic People'
+    result = subprocess.run(['git', 'commit', '-m', message], check=True)
+    logging.info('Pushing branch')
+    subprocess.run(['git', 'push', 'origin', branch_name], check=True)
+    logging.info('Creating PR')
+    pr = repo.create_pull(title=message, body=message, base='main', head=branch_name)
+    logging.info(f'Created PR: {pr.number}')
+    logging.info('Finished')
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -275,7 +275,7 @@ jobs:
         node-version: '18'
 
     - name: install pyright
-      run: npm install -g pyright@1.1.367  # try to keep this in sync with .pre-commit-config.yaml
+      run: npm install -g pyright@1.1.369  # try to keep this in sync with .pre-commit-config.yaml
 
     - name: run pyright tests
       run: make test-pyright
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,4 +36,4 @@ repos:
     types: [python]
     language: node
     pass_filenames: false
-    additional_dependencies: ["pyright@1.1.367"]  # try to keep this in sync with .github/workflows/ci.yml
+    additional_dependencies: ["pyright@1.1.369"]  # try to keep this in sync with .github/workflows/ci.yml
diff --git a/pdm.lock b/pdm.lock
diff --git a/pydantic/_internal/_generate_schema.py b/pydantic/_internal/_generate_schema.py
@@ -827,7 +827,7 @@ def match_type(self, obj: Any) -> core_schema.CoreSchema:  # noqa: C901
             return self._dict_schema(obj, *self._get_first_two_args_or_any(obj))
         elif isinstance(obj, TypeAliasType):
             return self._type_alias_type_schema(obj)
-        elif obj == type:
+        elif obj is type:
             return self._type_schema()
         elif _typing_extra.is_callable_type(obj):
             return core_schema.callable_schema()
@@ -1538,11 +1538,11 @@ def _pattern_schema(self, pattern_type: Any) -> core_schema.CoreSchema:
             pattern_type,
             required=True,
         )[0]
-        if param == str:
+        if param is str:
             return core_schema.no_info_plain_validator_function(
                 _validators.pattern_str_validator, serialization=ser, metadata=metadata
             )
-        elif param == bytes:
+        elif param is bytes:
             return core_schema.no_info_plain_validator_function(
                 _validators.pattern_bytes_validator, serialization=ser, metadata=metadata
             )
diff --git a/pydantic/_internal/_validators.py b/pydantic/_internal/_validators.py
@@ -37,18 +37,18 @@ def sequence_validator(
     # Additionally, we should be able to remove one of either this validator or the
     # SequenceValidator in _std_types_schema.py (preferably this one, while porting over some logic).
     # Effectively, a refactor for sequence validation is needed.
-    if value_type == tuple:
+    if value_type is tuple:
         input_value = list(input_value)
 
     v_list = validator(input_value)
 
     # the rest of the logic is just re-creating the original type from `v_list`
-    if value_type == list:
+    if value_type is list:
         return v_list
     elif issubclass(value_type, range):
         # return the list as we probably can't re-create the range
         return v_list
-    elif value_type == tuple:
+    elif value_type is tuple:
         return tuple(v_list)
     else:
         # best guess at how to re-create the original type, more custom construction logic might be required
diff --git a/pyproject.toml b/pyproject.toml
