commit
3409165e4c
@ -10,46 +10,24 @@
|
|||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "dvc";
|
pname = "dvc";
|
||||||
version = "2.9.5";
|
version = "2.10.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "iterative";
|
owner = "iterative";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";
|
hash = "sha256-boaQSg0jajWQZKB5wvcP2musVR2/pifT4pU64Y5hiQ0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# make the patch apply
|
|
||||||
prePatch = ''
|
|
||||||
substituteInPlace setup.cfg \
|
|
||||||
--replace "scmrepo==0.0.7" "scmrepo==0.0.10"
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./dvc-daemon.patch
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";
|
|
||||||
sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace setup.cfg \
|
|
||||||
--replace "grandalf==0.6" "grandalf>=0.6" \
|
|
||||||
--replace "scmrepo==0.0.13" "scmrepo"
|
|
||||||
substituteInPlace dvc/daemon.py \
|
|
||||||
--subst-var-by dvc "$out/bin/dcv"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = with python3.pkgs; [
|
nativeBuildInputs = with python3.pkgs; [
|
||||||
setuptools-scm
|
setuptools-scm
|
||||||
setuptools-scm-git-archive
|
setuptools-scm-git-archive
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
appdirs
|
|
||||||
aiohttp-retry
|
aiohttp-retry
|
||||||
|
appdirs
|
||||||
colorama
|
colorama
|
||||||
configobj
|
configobj
|
||||||
configobj
|
configobj
|
||||||
@ -57,12 +35,15 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
diskcache
|
diskcache
|
||||||
distro
|
distro
|
||||||
dpath
|
dpath
|
||||||
|
dvclive
|
||||||
|
dvc-render
|
||||||
flatten-dict
|
flatten-dict
|
||||||
flufl_lock
|
flufl_lock
|
||||||
funcy
|
funcy
|
||||||
grandalf
|
grandalf
|
||||||
nanotime
|
nanotime
|
||||||
networkx
|
networkx
|
||||||
|
packaging
|
||||||
pathspec
|
pathspec
|
||||||
ply
|
ply
|
||||||
psutil
|
psutil
|
||||||
@ -96,6 +77,14 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
importlib-resources
|
importlib-resources
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.cfg \
|
||||||
|
--replace "grandalf==0.6" "grandalf>=0.6" \
|
||||||
|
--replace "scmrepo==0.0.19" "scmrepo"
|
||||||
|
substituteInPlace dvc/daemon.py \
|
||||||
|
--subst-var-by dvc "$out/bin/dcv"
|
||||||
|
'';
|
||||||
|
|
||||||
# Tests require access to real cloud services
|
# Tests require access to real cloud services
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
47
pkgs/development/python-modules/dvc-render/default.nix
Normal file
47
pkgs/development/python-modules/dvc-render/default.nix
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, funcy
|
||||||
|
, pytestCheckHook
|
||||||
|
, pytest-mock
|
||||||
|
, pytest-test-utils
|
||||||
|
, pythonOlder
|
||||||
|
, tabulate
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "dvc-render";
|
||||||
|
version = "0.0.5";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "iterative";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-dL+ampYgcC77G89rnh7t6lVp7WoIR85gjP0eg89ci3g=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
funcy
|
||||||
|
tabulate
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
pytest-mock
|
||||||
|
pytest-test-utils
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"dvc_render"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Library for rendering DVC plots";
|
||||||
|
homepage = "https://github.com/iterative/dvclive";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
40
pkgs/development/python-modules/dvclive/default.nix
Normal file
40
pkgs/development/python-modules/dvclive/default.nix
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, dvc-render
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "dvclive";
|
||||||
|
version = "0.8.2";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "iterative";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-ditc4WWTEuO4ACqL87BNgjm1B6Aj6PPWrFX+OoF5jOI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
dvc-render
|
||||||
|
];
|
||||||
|
|
||||||
|
# Circular dependency with dvc
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"dvclive"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Library for logging machine learning metrics and other metadata in simple file formats";
|
||||||
|
homepage = "https://github.com/iterative/dvclive";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,41 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pytestCheckHook
|
||||||
|
, pytest
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pytest-test-utils";
|
||||||
|
version = "0.0.6";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "iterative";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-0lShdMNP2suN+JO0uKWwjsGQxFCRnCZEQp2h9hQNrrA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
pytest
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"pytest_test_utils"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Pytest utilities for tests";
|
||||||
|
homepage = "https://github.com/iterative/pytest-test-utils";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
@ -2602,6 +2602,10 @@ in {
|
|||||||
|
|
||||||
durus = callPackage ../development/python-modules/durus { };
|
durus = callPackage ../development/python-modules/durus { };
|
||||||
|
|
||||||
|
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||||
|
|
||||||
|
dvc-render = callPackage ../development/python-modules/dvc-render { };
|
||||||
|
|
||||||
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
||||||
|
|
||||||
dyn = callPackage ../development/python-modules/dyn { };
|
dyn = callPackage ../development/python-modules/dyn { };
|
||||||
@ -8299,6 +8303,8 @@ in {
|
|||||||
|
|
||||||
pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
|
pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
|
||||||
|
|
||||||
|
pytest-test-utils = callPackage ../development/python-modules/pytest-test-utils { };
|
||||||
|
|
||||||
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
|
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
|
||||||
|
|
||||||
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
|
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
|
||||||
|
Loading…
Reference in New Issue
Block a user