commit 3409165e4c5c245bedb83802f3182832c94517d4 · pyrox.dev/nixpkgs

+14 -25

pkgs/applications/version-management/dvc/default.nix

···

       10
       10
        
       

     

       11
       11
        
       python3.pkgs.buildPythonApplication rec {

     

       12
       12
        
         pname = "dvc";

     

       13
       13
       -
         version = "2.9.5";

     

       13
       13
       +
         version = "2.10.2";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "iterative";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";

     

       20
       20
       +
           hash = "sha256-boaQSg0jajWQZKB5wvcP2musVR2/pifT4pU64Y5hiQ0=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         # make the patch apply

     

       24
       24
       -
         prePatch = ''

     

       25
       25
       -
           substituteInPlace setup.cfg \

     

       26
       26
       -
             --replace "scmrepo==0.0.7" "scmrepo==0.0.10"

     

       27
       27
       -
         '';

     

       28
       28
       -
       

     

       29
       29
       -
         patches = [

     

       30
       30
       -
           ./dvc-daemon.patch

     

       31
       31
       -
           (fetchpatch {

     

       32
       32
       -
             url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";

     

       33
       33
       -
             sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";

     

       34
       34
       -
           })

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         postPatch = ''

     

       38
       38
       -
           substituteInPlace setup.cfg \

     

       39
       39
       -
             --replace "grandalf==0.6" "grandalf>=0.6" \

     

       40
       40
       -
             --replace "scmrepo==0.0.13" "scmrepo"

     

       41
       41
       -
           substituteInPlace dvc/daemon.py \

     

       42
       42
       -
             --subst-var-by dvc "$out/bin/dcv"

     

       43
       43
       -
         '';

     

       44
       44
       -
       

     

       45
       23
        
         nativeBuildInputs = with python3.pkgs; [

     

       46
       24
        
           setuptools-scm

     

       47
       25
        
           setuptools-scm-git-archive

     

       48
       26
        
         ];

     

       49
       27
        
       

     

       50
       28
        
         propagatedBuildInputs = with python3.pkgs; [

     

       51
       51
       -
           appdirs

     

       52
       29
        
           aiohttp-retry

     

       30
       30
       +
           appdirs

     

       53
       31
        
           colorama

     

       54
       32
        
           configobj

     

       55
       33
        
           configobj

     
···

       57
       35
        
           diskcache

     

       58
       36
        
           distro

     

       59
       37
        
           dpath

     

       38
       38
       +
           dvclive

     

       39
       39
       +
           dvc-render

     

       60
       40
        
           flatten-dict

     

       61
       41
        
           flufl_lock

     

       62
       42
        
           funcy

     

       63
       43
        
           grandalf

     

       64
       44
        
           nanotime

     

       65
       45
        
           networkx

     

       46
       46
       +
           packaging

     

       66
       47
        
           pathspec

     

       67
       48
        
           ply

     

       68
       49
        
           psutil

     
···

       95
       76
        
         ] ++ lib.optionals (pythonOlder "3.9") [

     

       96
       77
        
           importlib-resources

     

       97
       78
        
         ];

     

       79
       79
       +
       

     

       80
       80
       +
         postPatch = ''

     

       81
       81
       +
           substituteInPlace setup.cfg \

     

       82
       82
       +
             --replace "grandalf==0.6" "grandalf>=0.6" \

     

       83
       83
       +
             --replace "scmrepo==0.0.19" "scmrepo"

     

       84
       84
       +
           substituteInPlace dvc/daemon.py \

     

       85
       85
       +
             --subst-var-by dvc "$out/bin/dcv"

     

       86
       86
       +
         '';

     

       98
       87
        
       

     

       99
       88
        
         # Tests require access to real cloud services

     

       100
       89
        
         doCheck = false;

+47

pkgs/development/python-modules/dvc-render/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , funcy

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pytest-mock

     

       7
       7
       +
       , pytest-test-utils

     

       8
       8
       +
       , pythonOlder

     

       9
       9
       +
       , tabulate

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "dvc-render";

     

       14
       14
       +
         version = "0.0.5";

     

       15
       15
       +
         format = "pyproject";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.7";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "iterative";

     

       21
       21
       +
           repo = pname;

     

       22
       22
       +
           rev = "v${version}";

     

       23
       23
       +
           hash = "sha256-dL+ampYgcC77G89rnh7t6lVp7WoIR85gjP0eg89ci3g=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           funcy

     

       28
       28
       +
           tabulate

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         checkInputs = [

     

       32
       32
       +
           pytestCheckHook

     

       33
       33
       +
           pytest-mock

     

       34
       34
       +
           pytest-test-utils

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         pythonImportsCheck = [

     

       38
       38
       +
           "dvc_render"

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Library for rendering DVC plots";

     

       43
       43
       +
           homepage = "https://github.com/iterative/dvclive";

     

       44
       44
       +
           license = licenses.asl20;

     

       45
       45
       +
           maintainers = with maintainers; [ fab ];

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+40

pkgs/development/python-modules/dvclive/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , dvc-render

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "dvclive";

     

       11
       11
       +
         version = "0.8.2";

     

       12
       12
       +
         format = "pyproject";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.6";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "iterative";

     

       18
       18
       +
           repo = pname;

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           hash = "sha256-ditc4WWTEuO4ACqL87BNgjm1B6Aj6PPWrFX+OoF5jOI=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           dvc-render

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         # Circular dependency with dvc

     

       28
       28
       +
         doCheck = false;

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [

     

       31
       31
       +
           "dvclive"

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "Library for logging machine learning metrics and other metadata in simple file formats";

     

       36
       36
       +
           homepage = "https://github.com/iterative/dvclive";

     

       37
       37
       +
           license = licenses.asl20;

     

       38
       38
       +
           maintainers = with maintainers; [ fab ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+41

pkgs/development/python-modules/pytest-test-utils/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , pytest

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "pytest-test-utils";

     

       11
       11
       +
         version = "0.0.6";

     

       12
       12
       +
         format = "pyproject";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "iterative";

     

       18
       18
       +
           repo = pname;

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           hash = "sha256-0lShdMNP2suN+JO0uKWwjsGQxFCRnCZEQp2h9hQNrrA=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           pytest

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "pytest_test_utils"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with lib; {

     

       36
       36
       +
           description = "Pytest utilities for tests";

     

       37
       37
       +
           homepage = "https://github.com/iterative/pytest-test-utils";

     

       38
       38
       +
           license = licenses.asl20;

     

       39
       39
       +
           maintainers = with maintainers; [ fab ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

pkgs/top-level/python-packages.nix

···

       2602
       2602
        
       

     

       2603
       2603
        
         durus = callPackage ../development/python-modules/durus {  };

     

       2604
       2604
        
       

     

       2605
       2605
       +
         dvclive = callPackage ../development/python-modules/dvclive {  };

     

       2606
       2606
       +
       

     

       2607
       2607
       +
         dvc-render = callPackage ../development/python-modules/dvc-render {  };

     

       2608
       2608
       +
       

     

       2605
       2609
        
         dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };

     

       2606
       2610
        
       

     

       2607
       2611
        
         dyn = callPackage ../development/python-modules/dyn { };

     
···

       8298
       8302
        
         pytest-subtests = callPackage ../development/python-modules/pytest-subtests { };

     

       8299
       8303
        
       

     

       8300
       8304
        
         pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };

     

       8305
       8305
       +
       

     

       8306
       8306
       +
         pytest-test-utils = callPackage ../development/python-modules/pytest-test-utils { };

     

       8301
       8307
        
       

     

       8302
       8308
        
         pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };

     

       8303
       8309