diff options
author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2024-05-01 00:11:31 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 00:11:31 +0900 |
commit | 2d16ba12deaf6f9f66ba04a28f8de0ccacfe5642 (patch) | |
tree | c7be824b9cd7a505cbea99c3900cf6cfca707f94 /pkgs/development | |
parent | c001eaf4891d0c4f5a5392a07b2a5efa8dedf57c (diff) | |
parent | e164307585118d280c21f08aa84d5447a3d0a3d6 (diff) |
Merge pull request #253239 from natsukium/resolvelib/update
python311Packages.resolvelib: 0.5.5 -> 1.0.1
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/python-modules/ansible/core.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/resolvelib/default.nix | 28 |
2 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index d4f275184bab8..dccf9ede2253b 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { packaging passlib pyyaml - resolvelib # This library is a PITA, since ansible requires a very old version of it + resolvelib # optional dependencies junit-xml lxml diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 6b1292c4c7be0..d6c479fc4adf5 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -1,42 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , commentjson , pytestCheckHook }: buildPythonPackage rec { pname = "resolvelib"; - # Currently this package is only used by Ansible and breaking changes - # are frequently introduced, so when upgrading ensure the new version - # is compatible with Ansible - # https://github.com/NixOS/nixpkgs/pull/128636 - # https://github.com/ansible/ansible/blob/devel/requirements.txt - version = "0.5.5"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; + hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ commentjson pytestCheckHook ]; - # TODO: reenable after updating to >= 1.0.0 - # https://github.com/sarugaku/resolvelib/issues/114 - disabledTests = [ - "shared_parent_dependency" - "deep_complex_conflict" - "shared_parent_dependency_with_swapping" - "spapping_and_rewinding" - "pruned_unresolved_orphan" - "conflict_common_parent" - "same-package" - ]; pythonImportsCheck = [ "resolvelib" @@ -45,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; + changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ ]; }; |