pythonPackages.poetry: 1.0.10 -> 1.1.0

pkgs/development/python-modules/poetry/default.nix

@@ -7,14 +7,11 @@
 , httpretty
 , importlib-metadata
 , intreehooks
-, jsonschema
 , keyring
 , lockfile
 , pexpect
 , pkginfo
-, pygments
-, pyparsing
-, pyrsistent
+, poetry-core
 , pytestCheckHook
 , pytestcov
 , pytest-mock
@@ -22,11 +19,12 @@
 , requests-toolbelt
 , shellingham
 , tomlkit
+, virtualenv
 }:
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.0.10";
+  version = "1.1.0";
   format = "pyproject";
   disabled = isPy27;
 
@@ -34,19 +32,13 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = version;
-    sha256 = "00qfzjjs6clh93gfl1px3ma9km8qxl3f4z819nmyl58zc8ni3zyv";
+    sha256 = "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-     --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.16.0\"" \
-     --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \
-     --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \
-       'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \
-     --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"<2\"" \
-     --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \
-     --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \
-     --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\""
+     --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \
+       'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}'
   '';
 
   nativeBuildInputs = [ intreehooks ];
@@ -57,17 +49,16 @@ buildPythonPackage rec {
     cleo
     clikit
     html5lib
-    jsonschema
     keyring
     lockfile
     pexpect
     pkginfo
-    pyparsing
-    pyrsistent
+    poetry-core
     requests
     requests-toolbelt
     shellingham
     tomlkit
+    virtualenv
   ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   postInstall = ''
@@ -79,7 +70,7 @@ buildPythonPackage rec {
     "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
   '';
 
-  checkInputs = [ pytestCheckHook httpretty pytest-mock pygments pytestcov ];
+  checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ];
   preCheck = "export HOME=$TMPDIR";
   disabledTests = [
     # touches network
@@ -88,10 +79,13 @@ buildPythonPackage rec {
     "load"
     "vcs"
     "prereleases_if_they_are_compatible"
+    "test_executor"
     # requires git history to work correctly
     "default_with_excluded_data"
     # toml ordering has changed
     "lock"
+    # fs permission errors
+    "test_builder_should_execute_build_scripts"
   ];
 
   meta = with lib; {