Merge branch 'master' into pyproject

.isort.cfg

@@ -1,2 +0,0 @@
-[settings]
-known_third_party = graphql,graphql_relay,promise,pytest,pyutils,setuptools,snapshottest,sphinx_graphene_theme

.pre-commit-config.yaml

@@ -22,10 +22,7 @@ repos:
     -   id: pyupgrade
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.10
+    rev: v0.5.0
     hooks:
+        - id: ruff
         - id: ruff-format
--   repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
-    hooks:
-    -   id: flake8

bin/autolinter

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Install the required scripts with
-# pip install autoflake autopep8 isort
-autoflake ./examples/ ./graphene/ -r --remove-unused-variables --remove-all-unused-imports --in-place
-autopep8 ./examples/ ./graphene/ -r --in-place --experimental --aggressive --max-line-length 120
-isort -rc ./examples/ ./graphene/

docs/conf.py

@@ -1,4 +1,5 @@
 import os
+import sys
 
 import sphinx_graphene_theme
 
@@ -22,8 +23,6 @@ on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-import os
-import sys
 
 sys.path.insert(0, os.path.abspath(".."))
 

graphene/pyutils/version.py

@@ -71,6 +71,6 @@ def get_git_changeset():
         )
         timestamp = git_log.communicate()[0]
         timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
-    except:
+    except Exception:
         return None
     return timestamp.strftime("%Y%m%d%H%M%S")

graphene/relay/id_type.py

@@ -11,7 +11,7 @@ class BaseGlobalIDType:
     Base class that define the required attributes/method for a type.
     """
 
-    graphene_type = ID  # type: Type[BaseType]
+    graphene_type: Type[BaseType] = ID
 
     @classmethod
     def resolve_global_id(cls, info, global_id):

graphene/types/__init__.py

@@ -1,4 +1,3 @@
-# flake8: noqa
 from graphql import GraphQLResolveInfo as ResolveInfo
 
 from .argument import Argument

graphene/types/base.py

@@ -1,17 +1,17 @@
-from typing import Type
+from typing import Type, Optional
 
 from ..utils.subclass_with_meta import SubclassWithMeta, SubclassWithMeta_Meta
 from ..utils.trim_docstring import trim_docstring
 
 
 class BaseOptions:
-    name = None  # type: str
+    name: Optional[str] = None
-    description = None  # type: str
+    description: Optional[str] = None
 
-    _frozen = False  # type: bool
+    _frozen: bool = False
 
-    def __init__(self, class_type):
+    def __init__(self, class_type: Type):
-        self.class_type = class_type  # type: Type
+        self.class_type: Type = class_type
 
     def freeze(self):
         self._frozen = True

graphene/types/scalars.py

@@ -121,8 +121,7 @@ class Float(Scalar):
     """
 
     @staticmethod
-    def coerce_float(value):
+    def coerce_float(value: Any) -> float:
-        # type: (Any) -> float
         try:
             return float(value)
         except ValueError:

graphene/utils/dataloader.py

@@ -9,7 +9,7 @@ from collections import namedtuple
 from collections.abc import Iterable
 from functools import partial
 
-from typing import List  # flake8: noqa
+from typing import List
 
 Loader = namedtuple("Loader", "key,future")
 
@@ -62,7 +62,7 @@ class DataLoader(object):
         self.get_cache_key = get_cache_key or (lambda x: x)
 
         self._cache = cache_map if cache_map is not None else {}
-        self._queue = []  # type: List[Loader]
+        self._queue: List[Loader] = []
 
     @property
     def loop(self):