hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-04 08:41:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #779 from razielgn/fix-poetry-1-2-dev-deps-issue

Browse source 
fix: eval error on poetry 1.2 when a dev dependency is from git
This commit is contained in:
adisbladis 2022-10-21 03:20:27 +13:00 • committed by GitHub
commit a982fc6574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -202,7 +202,7 @@ lib.makeScope pkgs.newScope (self: {
sourceSpec = ( sourceSpec = (
(normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName} (normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName}
or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName} or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName}
or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies { }).${normalizedName} # Poetry 1.2.0+ or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+
or { } or { }
); );
} }

1
tests/default.nix
View file

@ -47,6 +47,7 @@ builtins.removeAttrs
file-wheel-deps = callTest ./file-wheel-deps { }; file-wheel-deps = callTest ./file-wheel-deps { };
file-wheel-deps-level2 = callTest ./file-wheel-deps-level2 { }; file-wheel-deps-level2 = callTest ./file-wheel-deps-level2 { };
git-deps = callTest ./git-deps { }; git-deps = callTest ./git-deps { };
git-deps-1_2_0 = callTest ./git-deps-1_2_0 { };
git-deps-pinned = callTest ./git-deps-pinned { }; git-deps-pinned = callTest ./git-deps-pinned { };
in-list = callTest ./in-list { }; in-list = callTest ./in-list { };
cli = poetry2nix; cli = poetry2nix;

8
tests/git-deps-1_2_0/default.nix Normal file
View file

@ -0,0 +1,8 @@
{ lib, poetry2nix, python3 }:
poetry2nix.mkPoetryApplication {
python = python3;
pyproject = ./pyproject.toml;
poetrylock = ./poetry.lock;
src = lib.cleanSource ./.;
}

0
tests/git-deps-1_2_0/git_deps/__init__.py Normal file
View file

22
tests/git-deps-1_2_0/poetry.lock generated Normal file
View file

@ -0,0 +1,22 @@
[[package]]
name = "colorama"
version = "0.4.4"
description = "Cross-platform colored terminal text."
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
develop = false
[package.source]
type = "git"
url = "https://github.com/tartley/colorama.git"
reference = "4321bbfda9aa190acdad05eb901d3b59439f0ec9"
resolved_reference = "4321bbfda9aa190acdad05eb901d3b59439f0ec9"
[metadata]
lock-version = "1.1"
python-versions = "^3.6"
content-hash = "cf3328f9b1d26a4b56fa6280838582940d6af2352ed39272c062503e302b8445"
[metadata.files]
colorama = []

15
tests/git-deps-1_2_0/pyproject.toml Normal file
View file

@ -0,0 +1,15 @@
[tool.poetry]
name = "git-deps"
version = "0.1.0"
description = "poetry2nix test"
authors = ["Your Name <you@example.com>"]
[tool.poetry.dependencies]
python = "^3.6"
[tool.poetry.group.dev.dependencies]
colorama = { git = "https://github.com/tartley/colorama.git", rev = "4321bbfda9aa190acdad05eb901d3b59439f0ec9" }
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"