Compare commits
130 Commits
Author | SHA1 | Date |
---|---|---|
inexcode | fbde801039 | |
inexcode | 266824b42b | |
inexcode | 191fe9f8cc | |
inexcode | fe70a2f6c1 | |
inexcode | 32da6dc3a8 | |
inexcode | 76e6d6e364 | |
inexcode | e4eb9712c7 | |
inexcode | 3ef98423d0 | |
inexcode | 87bb582ce8 | |
inexcode | be3f2050ef | |
inexcode | cf129ff7c5 | |
inexcode | 38823311dd | |
inexcode | 147e0767dc | |
inexcode | 0a9460784d | |
inexcode | 6fbced15e6 | |
inexcode | 53937812a4 | |
inexcode | 1a216a0b1f | |
inexcode | 31c30f7ae1 | |
inexcode | 4124e24cae | |
inexcode | fc5ad2152e | |
inexcode | fd1a33dbcc | |
inexcode | 065350c5f0 | |
inexcode | 3138d44308 | |
inexcode | 49242b5a83 | |
inexcode | 5fb0a1e0e6 | |
inexcode | e56e1994cd | |
inexcode | d9e797d274 | |
inexcode | c05124866d | |
inexcode | 02ade5b29d | |
inexcode | f2638dcce1 | |
inexcode | 2b461ebc9e | |
inexcode | f8da2059e1 | |
inexcode | 9f22b308ee | |
inexcode | 000fc0f057 | |
inexcode | 2415382acd | |
inexcode | 767501b854 | |
inexcode | 0301d04de6 | |
inexcode | 8b7e91dcfd | |
inexcode | 4f74abf105 | |
inexcode | f991c626f8 | |
inexcode | 47384698a0 | |
inexcode | 0970931614 | |
inexcode | bb7641fdf4 | |
inexcode | 36e1855b9c | |
inexcode | cb033ca27c | |
inexcode | 6e1d75fc5c | |
inexcode | 0e038f0a22 | |
inexcode | 7c8ede8425 | |
inexcode | 402ca26c0d | |
inexcode | e58ec2081f | |
inexcode | 18033d0665 | |
inexcode | f818c88461 | |
inexcode | 11adf9e612 | |
inexcode | 1d8d66fb9e | |
inexcode | 3f04e8aae6 | |
inexcode | 1fc90c36ef | |
inexcode | 2abf4b360f | |
inexcode | 1a38af595e | |
inexcode | 8b1d08f3aa | |
inexcode | 0a2fa826db | |
inexcode | 766117da01 | |
inexcode | e1fad3cc74 | |
inexcode | c526c197c3 | |
inexcode | 9f7bc2a89f | |
inexcode | 932febd3dc | |
inexcode | e4651e28e7 | |
inexcode | 654d17f7d6 | |
inexcode | 117a99ff4d | |
inexcode | 24b20043a1 | |
inexcode | 1a3b6c8782 | |
inexcode | b900c7d1c0 | |
Inex Code | 0a1fe41eda | |
Inex Code | f66a038a4f | |
Inex Code | 24ca661cb0 | |
Inex Code | 1f9ffc7cc8 | |
Inex Code | d7627c26cc | |
Inex Code | 0e5ee12011 | |
Inex Code | 42b6c576d7 | |
Inex Code | 8998b9af78 | |
Inex Code | 3b51e2d4ee | |
Inex Code | df1d3a3086 | |
Inex Code | a9e53a9270 | |
inexcode | 548f31511e | |
inexcode | e67d3d831d | |
inexcode | 7fb8f34ec9 | |
Inex Code | 5473f2e633 | |
Inex Code | 216966a8da | |
Inex Code | 356698caf5 | |
Inex Code | 014ab10fd0 | |
Inex Code | fbc3dbac17 | |
Inex Code | e37726e311 | |
Inex Code | b675f484f8 | |
Inex Code | 36fcb57c9e | |
Inex Code | fd676eccce | |
Inex Code | 2951c66aad | |
Inex Code | a8e32f1cfc | |
Inex Code | 1512e5b4ea | |
Inex Code | 1fb5ea5520 | |
Inex Code | 8683b8f500 | |
Inex Code | 9cb3c5dce5 | |
Inex Code | 8ddf6710bf | |
Inex Code | 60f04266fd | |
Inex Code | edf86fd05b | |
Inex Code | c37dfc8ab5 | |
Inex Code | 423ff97688 | |
Inex Code | b8b1b9ebe3 | |
Inex Code | d0a4f8f30f | |
Inex Code | d49ca7c42e | |
Inex Code | 7d36295dce | |
Inex Code | 762719f1f1 | |
Inex Code | c4e439d45e | |
Inex Code | ddf07797fd | |
Inex Code | b792f7f02e | |
Inex Code | 4ac14b3bef | |
Inex Code | 621cd5610a | |
Inex Code | c828c99a2c | |
Inex Code | 023270f94f | |
Inex Code | cf701f1668 | |
Inex Code | d7c0b43c0e | |
Inex Code | 74a057efd6 | |
Inex Code | 32be5a4d13 | |
Inex Code | 2461867cb9 | |
Inex Code | 438fe51d3c | |
Inex Code | d6f22a039f | |
Inex Code | 3dc0ece017 | |
Inex Code | 935a862001 | |
Inex Code | 6bfde54dce | |
Inex Code | e07b0c1707 | |
Inex Code | cd14e50d0f | |
Inex Code | 45499a501e |
38
default.nix
38
default.nix
|
@ -1,7 +1,41 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> { };
|
||||||
in
|
in
|
||||||
|
|
||||||
self: super: rec {
|
self: super: rec {
|
||||||
selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {};
|
python39 = super.python39.override {
|
||||||
|
packageOverrides = python-self: python-super: {
|
||||||
|
strawberry_graphql = python-super.buildPythonPackage rec {
|
||||||
|
pname = "strawberry-graphql";
|
||||||
|
version = "0.123.0";
|
||||||
|
format = "pyproject";
|
||||||
|
patches = [
|
||||||
|
./strawberry-graphql.patch
|
||||||
|
];
|
||||||
|
propagatedBuildInputs = with self.python39Packages; [
|
||||||
|
typing-extensions
|
||||||
|
graphql-core
|
||||||
|
python-multipart
|
||||||
|
python-dateutil
|
||||||
|
flask
|
||||||
|
pydantic
|
||||||
|
pygments
|
||||||
|
poetry
|
||||||
|
];
|
||||||
|
src = python-super.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-KsmZ5Xv8tUg6yBxieAEtvoKoRG60VS+iVGV0X6oCExo=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
pythonPackages = python39.pkgs;
|
||||||
|
selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {
|
||||||
|
nixpkgs = pkgs;
|
||||||
|
pythonPkgs = pythonPackages;
|
||||||
|
};
|
||||||
|
selfprivacy-graphql-api = super.callPackage ./pkgs/selfprivacy-graphql-api {
|
||||||
|
nixpkgs = pkgs;
|
||||||
|
pythonPkgs = pythonPackages;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,10 @@ let
|
||||||
|
|
||||||
selfprivacy-api =
|
selfprivacy-api =
|
||||||
{ buildPythonPackage
|
{ buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
, flask
|
, flask
|
||||||
, flask-restful
|
, flask-restful
|
||||||
|
, flask-cors
|
||||||
, setuptools
|
, setuptools
|
||||||
, portalocker
|
, portalocker
|
||||||
, flask-swagger
|
, flask-swagger
|
||||||
|
@ -19,17 +21,22 @@ let
|
||||||
, huey
|
, huey
|
||||||
, gevent
|
, gevent
|
||||||
, mnemonic
|
, mnemonic
|
||||||
|
, pydantic
|
||||||
|
, strawberry_graphql
|
||||||
|
, psutil
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
pythonPkgs.buildPythonPackage rec {
|
||||||
pname = "selfprivacy-api";
|
pname = "selfprivacy-api";
|
||||||
version = "1.2.6";
|
version = "1.2.6";
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
||||||
rev = "401dff23fb9223e8a0a4bd3ee942c61e471a07ab";
|
rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8";
|
||||||
|
ref = "test-branch";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
flask
|
flask
|
||||||
flask-restful
|
flask-restful
|
||||||
|
flask-cors
|
||||||
setuptools
|
setuptools
|
||||||
portalocker
|
portalocker
|
||||||
flask-swagger
|
flask-swagger
|
||||||
|
@ -41,6 +48,9 @@ let
|
||||||
huey
|
huey
|
||||||
gevent
|
gevent
|
||||||
mnemonic
|
mnemonic
|
||||||
|
pydantic
|
||||||
|
strawberry_graphql
|
||||||
|
psutil
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
description = ''
|
description = ''
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (nixpkgs) pkgs;
|
||||||
|
inherit pythonPkgs;
|
||||||
|
|
||||||
|
selfprivacy-graphql-api =
|
||||||
|
{ buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, setuptools
|
||||||
|
, portalocker
|
||||||
|
, pytz
|
||||||
|
, pytest
|
||||||
|
, pytest-mock
|
||||||
|
, pytest-datadir
|
||||||
|
, huey
|
||||||
|
, gevent
|
||||||
|
, mnemonic
|
||||||
|
, pydantic
|
||||||
|
, typing-extensions
|
||||||
|
, strawberry_graphql
|
||||||
|
, psutil
|
||||||
|
, fastapi
|
||||||
|
, uvicorn
|
||||||
|
}:
|
||||||
|
pythonPkgs.buildPythonApplication rec {
|
||||||
|
pname = "selfprivacy-graphql-api";
|
||||||
|
version = "2.0.0";
|
||||||
|
src = builtins.fetchGit {
|
||||||
|
url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
||||||
|
rev = "15a900d009720eea660d2c41f4122722661d1903";
|
||||||
|
ref = "fastapi";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
portalocker
|
||||||
|
pytz
|
||||||
|
pytest
|
||||||
|
pytest-mock
|
||||||
|
pytest-datadir
|
||||||
|
huey
|
||||||
|
gevent
|
||||||
|
mnemonic
|
||||||
|
pydantic
|
||||||
|
typing-extensions
|
||||||
|
strawberry_graphql
|
||||||
|
psutil
|
||||||
|
fastapi
|
||||||
|
uvicorn
|
||||||
|
];
|
||||||
|
meta = {
|
||||||
|
description = ''
|
||||||
|
SelfPrivacy Server Management API
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
passthru = {
|
||||||
|
pythonPath = pythonPkgs.makePythonPath propagatedBuildInputs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
drv = pythonPkgs.callPackage selfprivacy-graphql-api { };
|
||||||
|
in
|
||||||
|
drv
|
|
@ -0,0 +1,96 @@
|
||||||
|
diff --git a/pyproject.toml b/pyproject.toml
|
||||||
|
index 0cbf2ef..7736e92 100644
|
||||||
|
--- a/pyproject.toml
|
||||||
|
+++ b/pyproject.toml
|
||||||
|
@@ -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 80ed12a..f1bf2e9 100644
|
||||||
|
--- a/strawberry/field.py
|
||||||
|
+++ b/strawberry/field.py
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
import builtins
|
||||||
|
import dataclasses
|
||||||
|
+from functools import cached_property
|
||||||
|
import inspect
|
||||||
|
import sys
|
||||||
|
from typing import (
|
||||||
|
@@ -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 c5b3edd..f4112ce 100644
|
||||||
|
--- a/strawberry/types/fields/resolver.py
|
||||||
|
+++ b/strawberry/types/fields/resolver.py
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
from __future__ import annotations as _
|
||||||
|
|
||||||
|
import builtins
|
||||||
|
+from functools import cached_property
|
||||||
|
import inspect
|
||||||
|
import sys
|
||||||
|
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
|
||||||
|
diff --git a/strawberry/types/info.py b/strawberry/types/info.py
|
||||||
|
index a172c04..475a3ee 100644
|
||||||
|
--- a/strawberry/types/info.py
|
||||||
|
+++ b/strawberry/types/info.py
|
||||||
|
@@ -1,9 +1,8 @@
|
||||||
|
import dataclasses
|
||||||
|
+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 graphql.language import FieldNode
|
||||||
|
from graphql.pyutils.path import Path
|
Loading…
Reference in New Issue