diff --git a/default.nix b/default.nix index a2fafdc..f93e6e4 100644 --- a/default.nix +++ b/default.nix @@ -7,24 +7,41 @@ self: super: rec { packageOverrides = python-self: python-super: { strawberry_graphql = python-super.buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.114.5"; + version = "0.123.0"; format = "pyproject"; patches = [ ./strawberry-graphql.patch ]; propagatedBuildInputs = with self.python39Packages; [ typing-extensions - graphql-core + # graphql-core python-multipart python-dateutil flask pydantic pygments poetry + (buildPythonPackage rec { + pname = "graphql-core"; + version = "3.2.0"; + format = "setuptools"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-huKgvgCL/eGe94OI3opyWh2UKpGQykMcJKYIN5c4A84="; + }; + checkInputs = [ + pytest-asyncio + pytest-benchmark + pytestCheckHook + ]; + pythonImportsCheck = [ + "graphql" + ]; + }) ]; src = python-super.fetchPypi { inherit pname version; - sha256 = "b6e007281cf29a66eeba66a512744853d8aa53b4ca2525befb6f350bb7b24df6"; + sha256 = "sha256-KsmZ5Xv8tUg6yBxieAEtvoKoRG60VS+iVGV0X6oCExo="; }; }; }; diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 7c568eb..355a1bd 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,8 +30,8 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "e3245cd26aa9fd79c60259a4558dc2d456102b03"; - ref = "graphql"; + rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8"; + ref = "test-branch"; }; propagatedBuildInputs = [ flask diff --git a/strawberry-graphql.patch b/strawberry-graphql.patch index 3608342..b64a7ab 100644 --- a/strawberry-graphql.patch +++ b/strawberry-graphql.patch @@ -1,17 +1,47 @@ diff --git a/pyproject.toml b/pyproject.toml -index 3283fce..89d3e8c 100644 +index 0cbf2ef..7736e92 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -45,7 +45,6 @@ python-multipart = "^0.0.5" +@@ -51,7 +51,6 @@ python-multipart = "^0.0.5" sanic = {version = ">=20.12.2,<22.0.0", optional = true} aiohttp = {version = "^3.7.4.post0", optional = true} fastapi = {version = ">=0.65.2", optional = true} -"backports.cached-property" = "^1.0.1" - + [tool.poetry.dev-dependencies] pytest = "^7.1" +diff --git a/strawberry/directive.py b/strawberry/directive.py +index 491e390..26ba345 100644 +--- a/strawberry/directive.py ++++ b/strawberry/directive.py +@@ -1,10 +1,10 @@ + from __future__ import annotations + + import dataclasses ++from functools import cached_property + import inspect + from typing import Any, Callable, List, Optional, TypeVar + +-from backports.cached_property import cached_property + from typing_extensions import Annotated + + from graphql import DirectiveLocation +diff --git a/strawberry/extensions/tracing/datadog.py b/strawberry/extensions/tracing/datadog.py +index 01fba20..7c06950 100644 +--- a/strawberry/extensions/tracing/datadog.py ++++ b/strawberry/extensions/tracing/datadog.py +@@ -1,8 +1,8 @@ + import hashlib ++from functools import cached_property + from inspect import isawaitable + from typing import Optional + +-from backports.cached_property import cached_property + from ddtrace import tracer + + from strawberry.extensions import Extension diff --git a/strawberry/field.py b/strawberry/field.py -index 4e7ee4b..06c2044 100644 +index 80ed12a..f1bf2e9 100644 --- a/strawberry/field.py +++ b/strawberry/field.py @@ -1,5 +1,6 @@ @@ -24,30 +54,31 @@ index 4e7ee4b..06c2044 100644 @@ -18,7 +19,6 @@ from typing import ( overload, ) - + -from backports.cached_property import cached_property from typing_extensions import Literal - + from strawberry.annotation import StrawberryAnnotation diff --git a/strawberry/types/fields/resolver.py b/strawberry/types/fields/resolver.py -index 0409233..f4fbe9a 100644 +index c5b3edd..f4112ce 100644 --- a/strawberry/types/fields/resolver.py +++ b/strawberry/types/fields/resolver.py -@@ -1,13 +1,12 @@ +@@ -1,6 +1,7 @@ from __future__ import annotations as _ - + import builtins +from functools import cached_property import inspect import sys - from inspect import isasyncgenfunction, iscoroutinefunction - from typing import Callable, Dict, Generic, List, Mapping, Optional, TypeVar, Union - + import warnings +@@ -22,7 +23,6 @@ from typing import ( # type: ignore[attr-defined] + _eval_type, + ) + -from backports.cached_property import cached_property -- + from typing_extensions import Annotated, Protocol, get_args, get_origin + from strawberry.annotation import StrawberryAnnotation - from strawberry.arguments import StrawberryArgument - from strawberry.exceptions import MissingArgumentsAnnotationsError diff --git a/strawberry/types/info.py b/strawberry/types/info.py index a172c04..475a3ee 100644 --- a/strawberry/types/info.py @@ -57,7 +88,7 @@ index a172c04..475a3ee 100644 +from functools import cached_property import warnings from typing import TYPE_CHECKING, Any, Dict, Generic, List, Optional, TypeVar, Union - + -from backports.cached_property import cached_property - from graphql import GraphQLResolveInfo, OperationDefinitionNode