python3Packages.strawberry-graphql: 0.289.2 -> 0.316.0, python3Packages.cross-web: 0.4.1 -> 0.7.0, python3Packages.strawberry-django: 0.75.1 -> 0.86.0 (#528725)

pkgs/development/python-modules/cross-web/default.nix

@@ -1,54 +1,43 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  hatchling,
-
-  # dependencies
-  typing-extensions,
-
-  # optional-dependencies
-  fastapi,
-  httpx,
-  python-multipart,
-  starlette,
-  django,
-  flask,
-  werkzeug,
-  sanic,
   aiohttp,
-  yarl,
-  quart,
+  buildPythonPackage,
   chalice,
+  django,
+  fastapi,
+  fetchFromGitHub,
+  flask,
+  hatchling,
+  httpx,
   litestar,
-  sanic-testing,
-
-  # tests
   pytest-asyncio,
+  pytest-django,
   pytestCheckHook,
+  python-multipart,
+  quart,
+  sanic-testing,
+  sanic,
+  starlette,
+  typing-extensions,
+  werkzeug,
+  yarl,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "cross-web";
-  version = "0.4.1";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "usecross";
     repo = "cross-web";
     rev = finalAttrs.version;
-    hash = "sha256-CH7SKePJcBgLPrdb3/qoim0Wzdx78+rNpJFWDHO7JWA=";
+    hash = "sha256-JxwzTU17jCQMFNCtmcZVAZQnwDZjHNxCGNdKhkCMoPs=";
   };
 
-  build-system = [
-    hatchling
-  ];
+  build-system = [ hatchling ];
 
-  dependencies = [
-    typing-extensions
-  ];
+  dependencies = [ typing-extensions ];
 
   optional-dependencies = {
     integrations = [
@@ -71,13 +60,18 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-django
     pytestCheckHook
   ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
-  pythonImportsCheck = [
-    "cross_web"
-  ];
+  pythonImportsCheck = [ "cross_web" ];
+
+  preCheck = ''
+    export PYTHONPATH="$PYTHONPATH:$PWD/tests"
+  '';
+
+  env.DJANGO_SETTINGS_MODULE = "testing._django_settings";
 
   meta = {
     description = "Universal web framework adapter for Python";

pkgs/development/python-modules/strawberry-django/default.nix

@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "strawberry-django";
-  version = "0.75.1";
+  version = "0.86.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry-django";
     tag = version;
-    hash = "sha256-vosD0JZYZzzl6Mp+AAxdXVox/7ay4FqnwqE6f1lSw3s=";
+    hash = "sha256-pWhYJsfUxfK8FH9jSPWhd2P89AVYM5Z3wA2OlU6XLRo=";
   };
 
   postPatch = ''

pkgs/development/python-modules/strawberry-graphql/default.nix

@@ -13,12 +13,13 @@
   fetchFromGitHub,
   flask,
   freezegun,
+  graphlib-backport,
   graphql-core,
   inline-snapshot,
   libcst,
   opentelemetry-api,
   opentelemetry-sdk,
-  poetry-core,
+  protobuf,
   pydantic,
   pygments,
   pyinstrument,
@@ -33,33 +34,35 @@
   python-dateutil,
   python-multipart,
   rich,
-  sanic,
   sanic-testing,
+  sanic,
   starlette,
-  typing-extensions,
-  uvicorn,
   typer,
-  graphlib-backport,
+  typing-extensions,
+  uv-build,
+  uvicorn,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "strawberry-graphql";
-  version = "0.289.2";
+  version = "0.316.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry";
-    tag = version;
-    hash = "sha256-eiIyAYId5MHKWmn87Cj/TCNN4YU5KkAWMEMhoMIR8xM=";
+    tag = finalAttrs.version;
+    hash = "sha256-z9ZqIW0DD5/o2nuHqEjcjIaaHMMiT6jRoFddroSPP24=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.11,<0.12" "uv_build"
     substituteInPlace pyproject.toml \
       --replace-fail "--emoji" ""
   '';
 
-  build-system = [ poetry-core ];
+  build-system = [ uv-build ];
 
   dependencies = [
     cross-web
@@ -77,6 +80,7 @@ buildPythonPackage rec {
       starlette
       python-multipart
     ];
+    apollo-federation = [ protobuf ];
     debug = [
       rich
       libcst
@@ -138,7 +142,7 @@ buildPythonPackage rec {
     pytestCheckHook
     sanic-testing
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "strawberry" ];
 
@@ -163,9 +167,9 @@ buildPythonPackage rec {
   meta = {
     description = "GraphQL library for Python that leverages type annotations";
     homepage = "https://strawberry.rocks";
-    changelog = "https://github.com/strawberry-graphql/strawberry/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/strawberry-graphql/strawberry/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ izorkin ];
     mainProgram = "strawberry";
   };
-}
+})