diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 72cb75d784c0..f9190e727a1d 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -1,63 +1,64 @@ -{ lib -, appdirs -, buildPythonPackage -, colorama -, configobj -, distro -, dpath -, dvc-azure -, dvc-data -, dvc-gdrive -, dvc-gs -, dvc-hdfs -, dvc-http -, dvc-render -, dvc-s3 -, dvc-ssh -, dvc-studio-client -, dvc-task -, fetchFromGitHub -, flatten-dict -, flufl-lock -, funcy -, grandalf -, gto -, hydra-core -, importlib-metadata -, importlib-resources -, iterative-telemetry -, networkx -, packaging -, pathspec -, platformdirs -, psutil -, pydot -, pygtrie -, pyparsing -, pythonOlder -, pythonRelaxDepsHook -, requests -, rich -, ruamel-yaml -, scmrepo -, setuptools-scm -, shortuuid -, shtab -, tabulate -, tomlkit -, tqdm -, typing-extensions -, voluptuous -, zc-lockfile -, enableGoogle ? false -, enableAWS ? false -, enableAzure ? false -, enableSSH ? false +{ + lib, + appdirs, + buildPythonPackage, + colorama, + configobj, + distro, + dpath, + dvc-azure, + dvc-data, + dvc-gdrive, + dvc-gs, + dvc-hdfs, + dvc-http, + dvc-render, + dvc-s3, + dvc-ssh, + dvc-studio-client, + dvc-task, + fetchFromGitHub, + flatten-dict, + flufl-lock, + funcy, + grandalf, + gto, + hydra-core, + importlib-metadata, + importlib-resources, + iterative-telemetry, + networkx, + packaging, + pathspec, + platformdirs, + psutil, + pydot, + pygtrie, + pyparsing, + pythonOlder, + pythonRelaxDepsHook, + requests, + rich, + ruamel-yaml, + scmrepo, + setuptools-scm, + shortuuid, + shtab, + tabulate, + tomlkit, + tqdm, + typing-extensions, + voluptuous, + zc-lockfile, + enableGoogle ? false, + enableAWS ? false, + enableAzure ? false, + enableSSH ? false, }: buildPythonPackage rec { pname = "dvc"; - version = "3.49.0"; + version = "3.50.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +67,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-Qu2+zTcTIPxLRZn1GB3Q6465kSEAuN+wessBVgxEdFU="; + hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0="; }; pythonRelaxDeps = [ @@ -81,79 +82,64 @@ buildPythonPackage rec { --subst-var-by dvc "$out/bin/dcv" ''; - build-system = [ - pythonRelaxDepsHook - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - dependencies = [ - appdirs - colorama - configobj - distro - dpath - dvc-data - dvc-http - dvc-render - dvc-studio-client - dvc-task - flatten-dict - flufl-lock - funcy - grandalf - gto - hydra-core - iterative-telemetry - networkx - packaging - pathspec - platformdirs - psutil - pydot - pygtrie - pyparsing - requests - rich - ruamel-yaml - scmrepo - shortuuid - shtab - tabulate - tomlkit - tqdm - typing-extensions - voluptuous - zc-lockfile - ] - ++ lib.optionals enableGoogle passthru.optional-dependencies.gs - ++ lib.optionals enableAWS passthru.optional-dependencies.s3 - ++ lib.optionals enableAzure passthru.optional-dependencies.azure - ++ lib.optionals enableSSH passthru.optional-dependencies.ssh - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = + [ + appdirs + colorama + configobj + distro + dpath + dvc-data + dvc-http + dvc-render + dvc-studio-client + dvc-task + flatten-dict + flufl-lock + funcy + grandalf + gto + hydra-core + iterative-telemetry + networkx + packaging + pathspec + platformdirs + psutil + pydot + pygtrie + pyparsing + requests + rich + ruamel-yaml + scmrepo + shortuuid + shtab + tabulate + tomlkit + tqdm + typing-extensions + voluptuous + zc-lockfile + ] + ++ lib.optionals enableGoogle passthru.optional-dependencies.gs + ++ lib.optionals enableAWS passthru.optional-dependencies.s3 + ++ lib.optionals enableAzure passthru.optional-dependencies.azure + ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; passthru.optional-dependencies = { - azure = [ - dvc-azure - ]; - gdrive = [ - dvc-gdrive - ]; - gs = [ - dvc-gs - ]; - hdfs = [ - dvc-hdfs - ]; - s3 = [ - dvc-s3 - ]; - ssh = [ - dvc-ssh - ]; + azure = [ dvc-azure ]; + gdrive = [ dvc-gdrive ]; + gs = [ dvc-gs ]; + hdfs = [ dvc-hdfs ]; + s3 = [ dvc-s3 ]; + ssh = [ dvc-ssh ]; }; # Tests require access to real cloud services @@ -169,7 +155,10 @@ buildPythonPackage rec { homepage = "https://dvc.org"; changelog = "https://github.com/iterative/dvc/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai fab ]; + maintainers = with maintainers; [ + cmcdragonkai + fab + ]; mainProgram = "dvc"; }; }