From a9e53a9270197d38b461064c4e1003fc52363570 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Sat, 30 Jul 2022 17:52:51 +0300 Subject: [PATCH 01/11] Update --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 7c568eb..280749c 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "e3245cd26aa9fd79c60259a4558dc2d456102b03"; + rev = "67c8486c9bd644e15f27c7c33084fb273c6ce1cc"; ref = "graphql"; }; propagatedBuildInputs = [ From df1d3a30863a78dadce07b15806e5d401a33c691 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Sat, 30 Jul 2022 18:02:10 +0300 Subject: [PATCH 02/11] Update --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 280749c..671f341 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "67c8486c9bd644e15f27c7c33084fb273c6ce1cc"; + rev = "8ea6548710577fd4c6bc03808f26b42dba9718e2"; ref = "graphql"; }; propagatedBuildInputs = [ From 3b51e2d4ee0af52f74575f9a530f27680961ee08 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Mon, 1 Aug 2022 13:28:44 +0300 Subject: [PATCH 03/11] Backport graphql-core to NixOS 21.11 --- default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 10aa1f5..5453d7b 100644 --- a/default.nix +++ b/default.nix @@ -14,13 +14,30 @@ self: super: rec { ]; 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; From 8998b9af783ef19334e52de97dd3cba6eb94b80d Mon Sep 17 00:00:00 2001 From: Inex Code Date: Mon, 1 Aug 2022 13:29:55 +0300 Subject: [PATCH 04/11] =?UTF-8?q?Update=20Strawberry=200.114.5=20=E2=86=92?= =?UTF-8?q?=200.123.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.nix | 4 +-- strawberry-graphql.patch | 63 ++++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/default.nix b/default.nix index 5453d7b..9449b7c 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ 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 @@ -41,7 +41,7 @@ self: super: rec { ]; src = python-super.fetchPypi { inherit pname version; - sha256 = "b6e007281cf29a66eeba66a512744853d8aa53b4ca2525befb6f350bb7b24df6"; + sha256 = "sha256-KsmZ5Xv8tUg6yBxieAEtvoKoRG60VS+iVGV0X6oCExo="; }; }; }; 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 From 42b6c576d762f990244ef24c9ebcaae5b8a2be49 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 22:50:49 +0300 Subject: [PATCH 05/11] Test subscription --- pkgs/selfprivacy-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 671f341..c367c78 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 = "8ea6548710577fd4c6bc03808f26b42dba9718e2"; - ref = "graphql"; + rev = "52a58d94e7706c2a356e80c9f004ff71a4d57279"; + ref = "test-branch"; }; propagatedBuildInputs = [ flask From 0e5ee120118cab3205bc48c049e8066826c40e4d Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 22:54:01 +0300 Subject: [PATCH 06/11] Register subscription --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index c367c78..4f1194a 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "52a58d94e7706c2a356e80c9f004ff71a4d57279"; + rev = "d8d3cd20684be4238081e73fc124278508c3e27b"; ref = "test-branch"; }; propagatedBuildInputs = [ From d7627c26cca9378aedccdf83b0b3a0de53d8c403 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 22:58:53 +0300 Subject: [PATCH 07/11] Fix types --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 4f1194a..83ff810 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "d8d3cd20684be4238081e73fc124278508c3e27b"; + rev = "8ea0d89d71de8dbe0c42a755f3e7d3892b8fb240"; ref = "test-branch"; }; propagatedBuildInputs = [ From 1f9ffc7cc856b90b97e349df1403c1030dde206f Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 23:08:47 +0300 Subject: [PATCH 08/11] here we go again --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 83ff810..e591b68 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "8ea0d89d71de8dbe0c42a755f3e7d3892b8fb240"; + rev = "8f940e64fd40e5c5acfd3b3f5896cfe0d4bc97df"; ref = "test-branch"; }; propagatedBuildInputs = [ From 24ca661cb033b0d960b8fa26daab03b60216eea9 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 23:13:01 +0300 Subject: [PATCH 09/11] aah --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index e591b68..e7a2fd6 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "8f940e64fd40e5c5acfd3b3f5896cfe0d4bc97df"; + rev = "b965ffd96ae30dfd866d3fe07bccc8a476a76232"; ref = "test-branch"; }; propagatedBuildInputs = [ From f66a038a4fb46d5c1b545c3d390e8130d7e4e130 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 2 Aug 2022 23:30:19 +0300 Subject: [PATCH 10/11] uuh --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index e7a2fd6..c28464e 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "b965ffd96ae30dfd866d3fe07bccc8a476a76232"; + rev = "5e62798fde49776cb09cc1d1305305126f996fb3"; ref = "test-branch"; }; propagatedBuildInputs = [ From 0a1fe41eda494876839a474a5fe96230812c8609 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 3 Aug 2022 14:06:45 +0300 Subject: [PATCH 11/11] fix --- pkgs/selfprivacy-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index c28464e..355a1bd 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -30,7 +30,7 @@ let version = "1.2.6"; src = builtins.fetchGit { url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"; - rev = "5e62798fde49776cb09cc1d1305305126f996fb3"; + rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8"; ref = "test-branch"; }; propagatedBuildInputs = [