Unverified Commit 97fd81a6 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #283167 from fabaff/dvc-bump 

python311Packages.dvclive: 3.5.1 -> 3.41.1
parents f50e544e 595185b2

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

+5 −5
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 


buildPythonPackage rec {

  pname = "dvc-render";

  version = "1.0.0";

  format = "pyproject";

  version = "1.0.1";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "iterative";

    repo = pname;

    repo = "dvc-render";

    rev = "refs/tags/${version}";

    hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s=";

    hash = "sha256-7rmmhf6Y6teoHR8u1+Ce1Xq0rdtC1/MWLXb282OOEnc=";

  };



  nativeBuildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


buildPythonPackage rec {

  pname = "dvc";

  version = "3.40.1";

  version = "3.41.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -67,7 +67,7 @@ buildPythonPackage rec { 
    owner = "iterative";

    repo = "dvc";

    rev = "refs/tags/${version}";

    hash = "sha256-ik2WVq7cXhOc9kwBep38HELgvj0CGLtpx5EzzdJzAsc=";

    hash = "sha256-j4UkPHav97s5GAuR9yYWaI1ObfKcsyozlTDC9jeBfK4=";

  };



  pythonRelaxDeps = [

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

+87 −3
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, datasets

, dvc

, dvc-render

, dvc-studio-client

, fastai

, fetchFromGitHub

, funcy

, gto

, jsonargparse

, lightgbm

, lightning

, matplotlib

, mmcv

, numpy

, optuna

, pandas

, pillow

, pytestCheckHook

, pythonOlder

, ruamel-yaml

, scikit-learn

, scmrepo

, setuptools-scm

, tabulate

, tensorflow

, torch

, transformers

, xgboost

}:



buildPythonPackage rec {

  pname = "dvclive";

  version = "3.5.1";

  format = "pyproject";

  version = "3.41.1";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -23,7 +41,7 @@ buildPythonPackage rec { 
    owner = "iterative";

    repo = pname;

    rev = "refs/tags/${version}";

    hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc=";

    hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c=";

  };



  nativeBuildInputs = [
@@ -32,12 +50,78 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    dvc

    dvc-render

    dvc-studio-client

    funcy

    gto

    ruamel-yaml

    scmrepo

  ];



  passthru.optional-dependencies = {

    all = [

      jsonargparse

      lightgbm

      lightning

      matplotlib

      mmcv

      numpy

      optuna

      pandas

      pillow

      scikit-learn

      tensorflow

      torch

      transformers

      xgboost

    ] ++ jsonargparse.optional-dependencies.signatures;

    image = [

      numpy

      pillow

    ];

    sklearn = [

      scikit-learn

    ];

    plots = [

      pandas

      scikit-learn

      numpy

    ];

    markdown = [

      matplotlib

    ];

    mmcv = [

      mmcv

    ];

    tf = [

      tensorflow

    ];

    xgb = [

      xgboost

    ];

    lgbm = [

      lightgbm

    ];

    huggingface = [

      datasets

      transformers

    ];

    # catalyst = [

    #   catalyst

    # ];

    fastai = [

      fastai

    ];

    lightning = [

      lightning

      torch

      jsonargparse

    ] ++ jsonargparse.optional-dependencies.signatures;

    optuna = [

      optuna

    ];

  };



  # Circular dependency with dvc

  doCheck = false;

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

0 → 100644
+109 −0
Original line number Diff line number Diff line 
{ lib

, argcomplete

, attrs

, buildPythonPackage

, docstring-parser

, fetchFromGitHub

, fsspec

, jsonnet

, jsonschema

, omegaconf

, pydantic

, pytest-subtests

, pytestCheckHook

, pythonOlder

, pyyaml

, reconplogger

, requests

, responses

, ruyaml

, setuptools

, types-pyyaml

, types-requests

, typeshed-client

}:



buildPythonPackage rec {

  pname = "jsonargparse";

  version = "4.27.2";

  pyproject = true;



  disabled = pythonOlder "3.11";



  src = fetchFromGitHub {

    owner = "omni-us";

    repo = "jsonargparse";

    rev = "refs/tags/v${version}";

    hash = "sha256-qvc0HpwgYXDayA0q0D598rCb+I3LuaPm2tmmd0E3rrk=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    pyyaml

  ];



  passthru.optional-dependencies = {

    all = [

      argcomplete

      fsspec

      jsonnet

      jsonschema

      omegaconf

      ruyaml

      docstring-parser

      typeshed-client

      requests

    ];

    argcomplete = [

      argcomplete

    ];

    fsspec = [

      fsspec

    ];

    jsonnet = [

      jsonnet

      # jsonnet-binary

    ];

    jsonschema = [

      jsonschema

    ];

    omegaconf = [

      omegaconf

    ];

    reconplogger = [

      reconplogger

    ];

    ruyaml = [

      ruyaml

    ];

    signatures = [

      docstring-parser

      typeshed-client

    ];

    urls = [

      requests

    ];

  };



  nativeCheckInputs = [

    pytest-subtests

    pytestCheckHook

    types-pyyaml

    types-requests

  ];



  pythonImportsCheck = [

    "jsonargparse"

  ];



  meta = with lib; {

    description = "Module to mplement minimal boilerplate CLIs derived from various sources";

    homepage = "https://github.com/omni-us/jsonargparse";

    changelog = "https://github.com/omni-us/jsonargparse/blob/${version}/CHANGELOG.rst";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}

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

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, python-json-logger

, pythonOlder

, setuptools

}:



buildPythonPackage rec {

  pname = "logmatic-python";

  version = "0.1.7";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "logmatic";

    repo = "logmatic-python";

    rev = "refs/tags/${version}";

    hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    python-json-logger

  ];



  # Only functional tests, no unit tests

  doCheck = false;



  pythonImportsCheck = [

    "logmatic"

  ];



  meta = with lib; {

    description = "Python helpers to send logs to Logmatic.io";

    homepage = "https://github.com/logmatic/logmatic-python";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}