Remove default values and drop src from mkPoetryPyhon

Drp `poetrylock` and `pyproject` mandatory arguments
without default values and drops `src` from `mkPoetryPyhon`.

Fix test invocations with invalid arguments.
This commit is contained in:
Tobias Pflug 2019-12-17 12:38:34 +01:00
parent e529d26109
commit 08eb9637aa
7 changed files with 14 additions and 17 deletions

View file

@ -22,15 +22,13 @@ let
mkPoetryPython =
{ src
, poetrylock ? src + "/poetry.lock"
{ poetrylock
, overrides ? defaultPoetryOverrides
, meta ? {}
, python ? pkgs.python3
, ...
}@attrs: let
poetryLock = readTOML poetrylock;
lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
lockData = readTOML poetrylock;
lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData;
specialAttrs = [ "poetrylock" "overrides" ];
passedAttrs = builtins.removeAttrs attrs specialAttrs;
@ -50,7 +48,7 @@ let
partitions = let
supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
in
lib.partition supportsPythonVersion poetryLock.package;
lib.partition supportsPythonVersion lockData.package;
compatible = partitions.right;
incompatible = partitions.wrong;
@ -83,8 +81,8 @@ let
mkPoetryApplication =
{ src
, pyproject ? src + "/pyproject.toml"
, poetrylock ? src + "/poetry.lock"
, pyproject
, poetrylock
, overrides ? defaultPoetryOverrides
, meta ? {}
, python ? pkgs.python3
@ -94,8 +92,8 @@ let
py = mkPoetryPython (
{
inherit src pyproject poetrylock overrides meta python;
} // attrs
inherit poetrylock overrides meta python;
}
);
pyProject = readTOML pyproject;

View file

@ -5,7 +5,7 @@ poetry2nix.mkPoetryApplication {
inherit python;
pyproject = ./pyproject.toml;
poetryLock = ./poetry.lock;
poetrylock = ./poetry.lock;
src = fetchFromGitHub {
owner = "sdispater";

View file

@ -3,6 +3,6 @@
poetry2nix.mkPoetryApplication {
python = python3;
pyproject = ./pyproject.toml;
poetryLock = ./poetry.lock;
poetrylock = ./poetry.lock;
src = lib.cleanSource ./.;
}

View file

@ -3,6 +3,6 @@
poetry2nix.mkPoetryApplication {
python = python3;
pyproject = ./pyproject.toml;
poetryLock = ./poetry.lock;
poetrylock = ./poetry.lock;
src = lib.cleanSource ./.;
}

View file

@ -4,7 +4,7 @@ let
pkg = poetry2nix.mkPoetryApplication {
python = python3;
pyproject = ./pyproject.toml;
poetryLock = ./poetry.lock;
poetrylock = ./poetry.lock;
src = lib.cleanSource ./.;
};
p = pkg.python.withPackages (ps: [ ps.numpy ps.opencv-python ]);

View file

@ -3,8 +3,7 @@
let
python = poetry2nix.mkPoetryPython {
python = python3;
poetryLock = ./poetry.lock;
src = lib.cleanSource ./.;
poetrylock = ./poetry.lock;
overrides = poetry2nix.defaultPoetryOverrides // {
alembic = self: super: drv: drv.overrideAttrs (
old: {

View file

@ -3,6 +3,6 @@
poetry2nix.mkPoetryApplication {
python = python3;
pyproject = ./pyproject.toml;
poetryLock = ./poetry.lock;
poetrylock = ./poetry.lock;
src = lib.cleanSource ./.;
}