Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] python312Packages.datalad: 1.1.3 -> 1.1.5 #373163

Merged
merged 4 commits into from
Jan 13, 2025
Merged

[Backport release-24.11] python312Packages.datalad: 1.1.3 -> 1.1.5 #373163

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b883bc
python312Packages.datalad: 1.1.3 -> 1.1.4
r-ryantm Nov 19, 2024
c59a435
python312Packages.datalad: refactor
natsukium Nov 22, 2024
6a7343c
datalad: fix changed hash from upstream
gador Dec 10, 2024
79f9ac9
python312Packages.datalad: 1.1.4 -> 1.1.5
r-ryantm Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 36 additions & 40 deletions pkgs/development/python-modules/datalad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@
python-dateutil,
# duecredit
duecredit,
# python>=3.8
distro,
# win
colorama,
# python-version-dependent
pythonOlder,
importlib-resources,
importlib-metadata,
typing-extensions,
# tests
pytest-xdist,
pytestCheckHook,
p7zip,
curl,
Expand All @@ -52,13 +51,14 @@

buildPythonPackage rec {
pname = "datalad";
version = "1.1.3";
version = "1.1.4";
pyproject = true;

src = fetchFromGitHub {
owner = "datalad";
repo = pname;
repo = "datalad";
rev = "refs/tags/${version}";
hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc=";
hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA=";
};

postPatch = ''
Expand All @@ -79,49 +79,44 @@ buildPythonPackage rec {
];

dependencies =
[
# core
platformdirs
chardet
iso8601
humanize
fasteners
packaging
patool
tqdm
annexremote
looseversion
setuptools
git-annex

# downloaders-extra
# requests-ftp # not in nixpkgs yet

# downloaders
optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish;

optional-dependencies = {
core =
[
platformdirs
chardet
distro
iso8601
humanize
fasteners
packaging
patool
tqdm
annexremote
looseversion
]
++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
downloaders = [
boto3
keyrings-alt
keyring
msgpack
requests

# publish
python-gitlab

# misc
];
downloaders-extra = [
# requests-ftp # not in nixpkgs yet
];
publish = [ python-gitlab ];
misc = [
argcomplete
pyperclip
python-dateutil

# duecredit
duecredit

# python>=3.8
distro
]
++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
];
duecredit = [ duecredit ];
};

postInstall = ''
installShellCompletion --cmd datalad \
Expand Down Expand Up @@ -228,6 +223,7 @@ buildPythonPackage rec {

nativeCheckInputs = [
p7zip
pytest-xdist
pytestCheckHook
git-annex
curl
Expand Down