Merge pull request #1267 from andersk/subdirectory

Respect `subdirectory` from `poetry.lock` when fetching sources
nix-community · Oct 26, 2023 · 1ef8d81 · 1ef8d81
2 parents b005f34 + 65ab8f0
commit 1ef8d81
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 46 deletions.
diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix
@@ -178,54 +178,61 @@ pythonPackages.callPackage
       # Interpreters should declare what wheel types they're compatible with (python type + ABI)
       # Here we can then choose a file based on that info.
       src =
-        if isGit then
-          (
-            builtins.fetchGit ({
-              inherit (source) url;
-              rev = source.resolved_reference or source.reference;
-              ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
-            } // (
-              lib.optionalAttrs
-                (((sourceSpec ? rev) || (sourceSpec ? branch) || (source ? resolved_reference) || (source ? reference))
-                  && (lib.versionAtLeast builtins.nixVersion "2.4"))
+        let
+          srcRoot =
+            if isGit then
+              (
+                builtins.fetchGit ({
+                  inherit (source) url;
+                  rev = source.resolved_reference or source.reference;
+                  ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
+                } // (
+                  lib.optionalAttrs
+                    (((sourceSpec ? rev) || (sourceSpec ? branch) || (source ? resolved_reference) || (source ? reference))
+                      && (lib.versionAtLeast builtins.nixVersion "2.4"))
+                    {
+                      allRefs = true;
+                    }) // (
+                  lib.optionalAttrs (lib.versionAtLeast builtins.nixVersion "2.4") {
+                    submodules = true;
+                  })
+                )
+              )
+            else if isWheelUrl then
+              builtins.fetchurl
                 {
-                  allRefs = true;
-                }) // (
-              lib.optionalAttrs (lib.versionAtLeast builtins.nixVersion "2.4") {
-                submodules = true;
-              })
-            )
-          )
-        else if isWheelUrl then
-          builtins.fetchurl
-            {
-              inherit (source) url;
-              sha256 = fileInfo.hash;
-            }
-        else if isUrl then
-          builtins.fetchTarball
-            {
-              inherit (source) url;
-              sha256 = fileInfo.hash;
-            }
-        else if isDirectory then
-          (poetryLib.cleanPythonSources { src = localDepPath; })
-        else if isFile then
-          localDepPath
-        else if isLegacy then
-          fetchFromLegacy
-            {
-              pname = name;
-              inherit python;
-              inherit (fileInfo) file hash;
-              inherit (source) url;
-            }
+                  inherit (source) url;
+                  sha256 = fileInfo.hash;
+                }
+            else if isUrl then
+              builtins.fetchTarball
+                {
+                  inherit (source) url;
+                  sha256 = fileInfo.hash;
+                }
+            else if isDirectory then
+              (poetryLib.cleanPythonSources { src = localDepPath; })
+            else if isFile then
+              localDepPath
+            else if isLegacy then
+              fetchFromLegacy
+                {
+                  pname = name;
+                  inherit python;
+                  inherit (fileInfo) file hash;
+                  inherit (source) url;
+                }
+            else
+              fetchFromPypi {
+                pname = name;
+                inherit (fileInfo) file hash kind;
+                inherit version;
+              };
+        in
+        if source ? subdirectory then
+          srcRoot + "/${source.subdirectory}"
         else
-          fetchFromPypi {
-            pname = name;
-            inherit (fileInfo) file hash kind;
-            inherit version;
-          };
+          srcRoot;
     }
   )
 { }
diff --git a/tests/default.nix b/tests/default.nix
@@ -141,6 +141,7 @@ in
   contourpy-no-wheel = callTest ./contourpy-no-wheel { };
   pytesseract = callTest ./pytesseract { };
   sphinx5 = callTest ./sphinx5 { };
+  subdirectory = callTest ./subdirectory { };
 } // lib.optionalAttrs (!stdenv.isDarwin) {
   # Test deadlocks on darwin, sandboxing issue?
   dependency-environment = callTest ./dependency-environment { };

diff --git a/tests/subdirectory/default.nix b/tests/subdirectory/default.nix
@@ -0,0 +1,14 @@
+{ lib, poetry2nix, postgresql_14, runCommandCC, stdenv }:
+
+let env = poetry2nix.mkPoetryEnv { projectDir = ./.; };
+in if stdenv.isDarwin then
+  env
+else
+  runCommandCC "subdirectory-test"
+  {
+    PSYCOPG_IMPL = "python";
+    LD_LIBRARY_PATH = lib.makeLibraryPath [ postgresql_14 ];
+  } ''
+    '${env}/bin/python' -c 'import psycopg'
+    touch "$out"
+  ''
diff --git a/tests/subdirectory/poetry.lock b/tests/subdirectory/poetry.lock
diff --git a/tests/subdirectory/pyproject.toml b/tests/subdirectory/pyproject.toml
@@ -0,0 +1,13 @@
+[tool.poetry]
+name = "subdirectory-test"
+version = "0.1.0"
+description = ""
+authors = []
+
+[tool.poetry.dependencies]
+python = "^3.10"
+psycopg = {git = "https://github.com/psycopg/psycopg.git", rev = "3.1.10", subdirectory = "psycopg"}
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"