pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #247019 from tjni/dvc-app-and-library

python3.pkgs.dvc, dvc, dvc-with-remotes: move to python-modules since dvclive depends on it

authored by

OTABI Tomoya and committed by
GitHub 8f1e7a5d 44b6fb57

+66 -15
+62 -13
pkgs/applications/version-management/dvc/default.nix pkgs/development/python-modules/dvc/default.nix
··· 1 1 { lib 2 - , python3 2 + , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , fetchpatch 5 + , pythonOlder 6 + , pythonRelaxDepsHook 7 + , setuptools-scm 8 + , appdirs 9 + , colorama 10 + , configobj 11 + , distro 12 + , dpath 13 + , dvc-azure 14 + , dvc-data 15 + , dvc-gs 16 + , dvc-http 17 + , dvc-render 18 + , dvc-s3 19 + , dvc-ssh 20 + , dvc-studio-client 21 + , dvc-task 22 + , flatten-dict 23 + , flufl_lock 24 + , funcy 25 + , grandalf 26 + , hydra-core 27 + , importlib-metadata 28 + , importlib-resources 29 + , iterative-telemetry 30 + , networkx 31 + , packaging 32 + , pathspec 33 + , platformdirs 34 + , psutil 35 + , pydot 36 + , pygtrie 37 + , pyparsing 38 + , requests 39 + , rich 40 + , ruamel-yaml 41 + , scmrepo 42 + , shortuuid 43 + , shtab 44 + , tabulate 45 + , tomlkit 46 + , tqdm 47 + , typing-extensions 48 + , voluptuous 49 + , zc_lockfile 5 50 , enableGoogle ? false 6 51 , enableAWS ? false 7 52 , enableAzure ? false 8 53 , enableSSH ? false 9 54 }: 10 55 11 - python3.pkgs.buildPythonApplication rec { 56 + buildPythonPackage rec { 12 57 pname = "dvc"; 13 58 version = "3.8.1"; 14 59 format = "pyproject"; ··· 31 76 --subst-var-by dvc "$out/bin/dcv" 32 77 ''; 33 78 34 - nativeBuildInputs = with python3.pkgs; [ 79 + nativeBuildInputs = [ 35 80 pythonRelaxDepsHook 36 81 setuptools-scm 37 82 ]; 38 83 39 - propagatedBuildInputs = with python3.pkgs; [ 84 + propagatedBuildInputs = [ 40 85 appdirs 41 86 colorama 42 87 configobj ··· 73 118 typing-extensions 74 119 voluptuous 75 120 zc_lockfile 76 - ] ++ lib.optionals enableGoogle [ 77 - dvc-gs 78 - ] ++ lib.optionals enableAWS [ 79 - dvc-s3 80 - ] ++ lib.optionals enableAzure [ 81 - dvc-azure 82 - ] ++ lib.optionals enableSSH [ 83 - dvc-ssh 84 - ] ++ lib.optionals (pythonOlder "3.8") [ 121 + ] 122 + ++ lib.optionals enableGoogle passthru.optional-dependencies.gs 123 + ++ lib.optionals enableAWS passthru.optional-dependencies.s3 124 + ++ lib.optionals enableAzure passthru.optional-dependencies.azure 125 + ++ lib.optionals enableSSH passthru.optional-dependencies.ssh 126 + ++ lib.optionals (pythonOlder "3.8") [ 85 127 importlib-metadata 86 128 ] ++ lib.optionals (pythonOlder "3.9") [ 87 129 importlib-resources 88 130 ]; 131 + 132 + passthru.optional-dependencies = { 133 + azure = [ dvc-azure ]; 134 + gs = [ dvc-gs ]; 135 + s3 = [ dvc-s3 ]; 136 + ssh = [ dvc-ssh ]; 137 + }; 89 138 90 139 # Tests require access to real cloud services 91 140 doCheck = false;
pkgs/applications/version-management/dvc/dvc-daemon.patch pkgs/development/python-modules/dvc/dvc-daemon.patch
+2 -2
pkgs/top-level/all-packages.nix
··· 5025 5025 5026 5026 duperemove = callPackage ../tools/filesystems/duperemove { }; 5027 5027 5028 - dvc = callPackage ../applications/version-management/dvc { }; 5028 + dvc = with python3.pkgs; toPythonApplication dvc; 5029 5029 5030 - dvc-with-remotes = callPackage ../applications/version-management/dvc { 5030 + dvc-with-remotes = dvc.override { 5031 5031 enableGoogle = true; 5032 5032 enableAWS = true; 5033 5033 enableAzure = true;
+2
pkgs/top-level/python-packages.nix
··· 3187 3187 3188 3188 durus = callPackage ../development/python-modules/durus { }; 3189 3189 3190 + dvc = callPackage ../development/python-modules/dvc { }; 3191 + 3190 3192 dvc-azure = callPackage ../development/python-modules/dvc-azure { }; 3191 3193 3192 3194 dvc-data = callPackage ../development/python-modules/dvc-data { };