Robert Schütz 2024-02-25 09:07:21 -08:00
parent 83e0914cfd
commit 9f269d495c
2 changed files with 13 additions and 45 deletions

View File

@ -12,12 +12,12 @@ let
# We keep the override around even when the versions match, as
# it's likely to become relevant again after the next Poetry update.
poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "python-poetry";
repo = "poetry-core";
rev = version;
hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM=";
rev = "refs/tags/${version}";
hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw=";
};
});
} // (plugins self);

View File

@ -4,7 +4,6 @@
, pythonOlder
, fetchFromGitHub
, installShellFiles
, pythonRelaxDepsHook
, build
, cachecontrol
, cleo
@ -29,41 +28,30 @@
, xattr
, tomli
, importlib-metadata
, cachy
, deepdiff
, flatdict
, pytestCheckHook
, httpretty
, pytest-mock
, pytest-xdist
, pythonAtLeast
, darwin
}:
buildPythonPackage rec {
pname = "poetry";
version = "1.7.1";
version = "1.8.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "python-poetry";
repo = pname;
repo = "poetry";
rev = "refs/tags/${version}";
hash = "sha256-PM3FIZYso7p0Oe0RpiPuxHrQrgnMlkT5SVeaJPK/J94=";
hash = "sha256-tHtd5vO3TMjO0gqyECuS0FUAcE90nkKZwOm3ne6poFQ=";
};
nativeBuildInputs = [
installShellFiles
pythonRelaxDepsHook
];
pythonRelaxDeps = [
# platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c
"platformdirs"
# xattr 1.0 is backwards compatible modulo dropping Python 2 support: https://github.com/xattr/xattr/compare/v0.10.0...v1.0.0
"xattr"
];
propagatedBuildInputs = [
@ -104,9 +92,7 @@ buildPythonPackage rec {
'';
nativeCheckInputs = [
cachy
deepdiff
flatdict
pytestCheckHook
httpretty
pytest-mock
@ -127,32 +113,14 @@ buildPythonPackage rec {
'';
disabledTests = [
"test_env_system_packages_are_relative_to_lib"
"test_install_warning_corrupt_root"
"test_installer_with_pypi_repository"
# touches network
"git"
"solver"
"load"
"vcs"
"prereleases_if_they_are_compatible"
"test_builder_setup_generation_runs_with_pip_editable"
"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"
# poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available.
"test_isolated_env_install_success"
"test_prepare_sdist"
"test_prepare_directory"
"test_prepare_directory_with_extensions"
"test_prepare_directory_editable"
] ++ lib.optionals (pythonAtLeast "3.10") [
# RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended
"test_info_setup_complex_pep517_error"
"test_env_system_packages_are_relative_to_lib"
"test_executor_known_hashes"
"test_install_warning_corrupt_root"
];
pytestFlagsArray = [
"-m 'not network'"
];
# Allow for package to use pep420's native namespaces