diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2024-01-31 17:41:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-31 17:41:16 +0100 |
commit | 760da9ea50eb0decac22198b597cea3d035d91d7 (patch) | |
tree | 3f93f9473d95c13e7b53d66cd7c6f629dc7819a0 /pkgs | |
parent | 2b99737ace26d9b2e69b27fd73063a73f6f0c707 (diff) | |
parent | fe89d4bf2575f56273a070a52925576ffa132dc9 (diff) |
Merge pull request #285074 from fabaff/scmrepo-bump
python311Packages.pygit2: 1.13.3 -> 1.14.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/git-annex-adapter/default.nix | 51 | ||||
-rw-r--r-- | pkgs/development/python-modules/pygit2/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/python-modules/scmrepo/default.nix | 4 |
3 files changed, 50 insertions, 19 deletions
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 1279be5e9d3f5..8af128e895a0c 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll -, python, util-linux, pygit2, gitMinimal, git-annex, cacert +{ lib +, buildPythonPackage +, cacert +, fetchFromGitHub +, fetchpatch +, git-annex +, gitMinimal +, pygit2 +, pytestCheckHook +, python +, pythonOlder +, setuptools +, substituteAll +, util-linux }: buildPythonPackage rec { pname = "git-annex-adapter"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; - # No tests in PyPI tarball src = fetchFromGitHub { owner = "alpernebbi"; - repo = pname; - rev = "v${version}"; - sha256 = "0666vqspgnvmfs6j3kifwyxr6zmxjs0wlwis7br4zcq0gk32zgdx"; + repo = "git-annex-adapter"; + rev = "refs/tags/v${version}"; + hash = "sha256-vb0vxnwAs0/yOjpyyoGWvX6Tu+cuziGNdnXbdzXexhg="; }; patches = [ @@ -37,17 +48,31 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pygit2 + cacert + ]; + nativeCheckInputs = [ gitMinimal util-linux # `rev` is needed in tests/test_process.py + pytestCheckHook ]; - propagatedBuildInputs = [ pygit2 cacert ]; + pythonImportsCheck = [ + "git_annex_adapter" + ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - pythonImportsCheck = [ "git_annex_adapter" ]; + disabledTests = [ + # KeyError and AssertionError + "test_jsonprocess_annex_metadata_batch" + "test_process_annex_metadata_batch" + "test_batchjson_metadata" + ]; meta = with lib; { homepage = "https://github.com/alpernebbi/git-annex-adapter"; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 50211bda64002..0a2e73c3c18e8 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -10,24 +10,29 @@ , pycparser , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygit2"; - version = "1.13.3"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-AlfGJgEeSvuZvbIIdUQ/cG+EIB1MkmN/AiFbmOrBPe0="; + hash = "sha256-9SntlmDtv5tiXMrn5RCY73NmLmFJZgkAl3LUYnqCaqg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libgit2 ]; @@ -65,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://github.com/libgit2/pygit2"; + changelog = "https://github.com/libgit2/pygit2/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 6faf74e51aa13..611949ae65159 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "2.0.4"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gBGfL6Xet7ASdwRTFJ5nHpyeXi/pqlrL9o5nC3m48hk="; + hash = "sha256-KG7Y+1qqsgDwgRYsb3XbZnF6FduHJCAEizfuugBi0Go="; }; nativeBuildInputs = [ |