poetry2nix: 1.34.1 -> 1.35.0

pkgs/development/tools/poetry2nix/poetry2nix/default.nix

@@ -5,7 +5,7 @@
 }:
 let
   # Poetry2nix version
-  version = "1.34.1";
+  version = "1.35.0";
 
   inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;
 
@@ -159,11 +159,14 @@ lib.makeScope pkgs.newScope (self: {
       };
 
       poetryLock = readTOML poetrylock;
+
+      # Lock file version 1.1 files
       lockFiles =
         let
           lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
         in
         lib.listToAttrs (lib.mapAttrsToList (n: v: { name = normalizePackageName n; value = v; }) lockfiles);
+
       evalPep508 = mkEvalPep508 python;
 
       # Filter packages by their PEP508 markers & pyproject interpreter version
@@ -192,7 +195,8 @@ lib.makeScope pkgs.newScope (self: {
                     pkgMeta // {
                       inherit pwd preferWheels;
                       source = pkgMeta.source or null;
-                      files = lockFiles.${normalizedName};
+                      # Default to files from lock file version 2.0 and fall back to 1.1
+                      files = pkgMeta.files or lockFiles.${normalizedName};
                       pythonPackages = self;
 
                       sourceSpec = (

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

@@ -1200,6 +1200,7 @@ lib.composeManyExtensions [
         old: {
           buildInputs = (old.buildInputs or [ ]) ++ [
             self.types-typed-ast
+            self.types-setuptools
           ];
           # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
           # version is also the default in the wheels on Pypi that include binaries.

pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry"
-version = "1.2.1"
+version = "1.2.2"
 description = "Python dependency management and packaging made easy."
 authors = [
     "Sébastien Eustace <sebastien@eustace.io>",
@@ -44,8 +44,8 @@ generate-setup-file = false
 [tool.poetry.dependencies]
 python = "^3.7"
 
-poetry-core = "1.2.0"
-poetry-plugin-export = "^1.0.7"
+poetry-core = "1.3.2"
+poetry-plugin-export = "^1.1.2"
 "backports.cached-property" = { version = "^1.0.2", python = "<3.8" }
 cachecontrol = { version = "^0.12.9", extras = ["filecache"] }
 cachy = "^0.3.0"
@@ -72,24 +72,34 @@ xattr = { version = "^0.9.7", markers = "sys_platform == 'darwin'" }
 urllib3 = "^1.26.0"
 dulwich = "^0.20.46"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 tox = "^3.18"
-pytest = "^7.1"
-pytest-cov = "^3.0"
-pytest-mock = "^3.5"
-pytest-randomly = "^3.10"
-pytest-sugar = "^0.9"
-pytest-xdist = { version = "^2.5", extras = ["psutil"] }
 pre-commit = "^2.6"
+
+[tool.poetry.group.test.dependencies]
 deepdiff = "^5.0"
+flatdict = "^4.0.1"
 httpretty = "^1.0"
-typing-extensions = { version = "^4.0.0", python = "<3.8" }
+pytest = "^7.1"
+pytest-cov = "^4.0"
+pytest-mock = "^3.9"
+pytest-randomly = "^3.12"
+pytest-xdist = { version = "^2.5", extras = ["psutil"] }
 zipp = { version = "^3.4", python = "<3.8" }
-flatdict = "^4.0.1"
+
+[tool.poetry.group.typing.dependencies]
 mypy = ">=0.971"
 types-html5lib = ">=1.1.9"
 types-jsonschema = ">=4.9.0"
 types-requests = ">=2.28.8"
+typing-extensions = { version = "^4.0.0", python = "<3.8" }
+
+# only used in github actions
+[tool.poetry.group.github-actions]
+optional = true
+[tool.poetry.group.github-actions.dependencies]
+pytest-github-actions-annotate-failures = "^0.1.7"
+
 
 [tool.poetry.scripts]
 poetry = "poetry.console.application:main"
@@ -165,6 +175,14 @@ module = [
 ]
 ignore_missing_imports = true
 
+
+[tool.pytest.ini_options]
+addopts = "-n auto"
+testpaths = [
+    "tests"
+]
+
+
 [tool.coverage.report]
 exclude_lines = [
     "pragma: no cover",

pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json

@@ -1,8 +1,8 @@
 {
   "owner": "python-poetry",
   "repo": "poetry",
-  "rev": "1.2.1",
-  "sha256": "10y2vs28xbg5msr49wvhm3s780v4hb2jpxn7lzdin4l1qkrchdiq",
+  "rev": "1.2.2",
+  "sha256": "04cdrq9mjdnp28jx63vjlwj72wrad7941hp3k7263qskzlp27ql6",
   "fetchSubmodules": true
 }