Unverified Commit 29aa71e0 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #213038 from mattmelling/dvc-2.43.1 

dvc: 2.17.0 -> 2.43.1
parents edb40b3e b4899e50

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

+20 −24
Original line number Diff line number Diff line
@@ -10,56 +10,56 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "dvc";

  version = "2.17.0";

  format = "setuptools";

  version = "2.56.0";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "iterative";

    repo = pname;

    rev = version;

    hash = "sha256-P0J+3TNHGqMw3krfs1uLnf8nEiIBK6UrrB37mY+fBA0=";

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

    hash = "sha256-IpdlNwOuUNWgfphRH2UTQ/IvBHo39PafCqyioju8miI=";

  };



  pythonRelaxDeps = [

    "dvc-data"

    "platformdirs"

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "grandalf==0.6" "grandalf" \

      --replace "scmrepo==0.0.25" "scmrepo" \

      --replace "pathspec>=0.9.0,<0.10.0" "pathspec"

    substituteInPlace dvc/daemon.py \

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

  '';



  nativeBuildInputs = with python3.pkgs; [

    pythonRelaxDepsHook

    setuptools-scm

  ];



  propagatedBuildInputs = with python3.pkgs; [

    aiohttp-retry

    appdirs

    colorama

    configobj

    dictdiffer

    diskcache

    distro

    dpath

    dvclive

    dvc-data

    dvc-http

    dvc-render

    dvc-studio-client

    dvc-task

    flatten-dict

    flufl_lock

    funcy

    grandalf

    nanotime

    hydra-core

    iterative-telemetry

    networkx

    packaging

    pathspec

    ply

    platformdirs

    psutil

    pydot

    pygtrie

    pyparsing

    python-benedict

    requests

    rich

    ruamel-yaml
@@ -73,17 +73,13 @@ python3.pkgs.buildPythonApplication rec { 
    voluptuous

    zc_lockfile

  ] ++ lib.optionals enableGoogle [

    gcsfs

    google-cloud-storage

    dvc-gs

  ] ++ lib.optionals enableAWS [

    aiobotocore

    boto3

    s3fs

    dvc-s3

  ] ++ lib.optionals enableAzure [

    azure-identity

    knack

    dvc-azure

  ] ++ lib.optionals enableSSH [

    bcrypt

    dvc-ssh

  ] ++ lib.optionals (pythonOlder "3.8") [

    importlib-metadata

  ] ++ lib.optionals (pythonOlder "3.9") [
@@ -96,8 +92,8 @@ python3.pkgs.buildPythonApplication rec { 
  meta = with lib; {

    description = "Version Control System for Machine Learning Projects";

    homepage = "https://dvc.org";

    changelog = "https://github.com/iterative/dvc/releases/tag/${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ cmcdragonkai fab ];

    broken = true; # requires new python package: dvc-studio-client

  };

}

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

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

, adlfs

, azure-identity

, buildPythonPackage

, fetchPypi

, knack

, pythonRelaxDepsHook

, setuptools-scm }:



buildPythonPackage rec {

  pname = "dvc-azure";

  version = "2.21.0";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-VN3QSGb4cLhxX8JV1Pg4/449SJOWv9Tu3kcDGbDwAYw=";

  };



  # Prevent circular dependency

  pythonRemoveDeps = [ "dvc" ];



  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];



  propagatedBuildInputs = [

    adlfs azure-identity knack

  ];



  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_azure" ];



  meta = with lib; {

    description = "azure plugin for dvc";

    homepage = "https://pypi.org/project/dvc-azure/${version}";

    changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ melling ];

  };

}

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

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


buildPythonPackage rec {

  pname = "dvc-data";

  version = "0.41.3";

  version = "0.47.2";

  format = "pyproject";



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

    repo = pname;

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

    hash = "sha256-+rK5OGbIBP7g69swhsgnaJovllxp7XdO8iT3hfYwhV4=";

    hash = "sha256-5DbnvIScSq+bu8ki0eUwUZd9Gf3KlhD+I0/PpWfGOu0=";

  };



  SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

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

, buildPythonPackage

, dvc-objects

, fetchPypi

, gcsfs

, pythonRelaxDepsHook

, setuptools-scm }:



buildPythonPackage rec {

  pname = "dvc-gs";

  version = "2.21.0";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-MGNDEhJJGSQIPDXGv/y4u1UHnh4HnNbKtQbGHys0dSA=";

  };



  # Prevent circular dependency

  pythonRemoveDeps = [ "dvc" ];



  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];



  propagatedBuildInputs = [ gcsfs dvc-objects ];



  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_gs" ];



  meta = with lib; {

    description = "gs plugin for dvc";

    homepage = "https://pypi.org/project/dvc-gs/version";

    changelog = "https://github.com/iterative/dvc-gs/releases/tag/${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ melling ];

  };

}

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

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


buildPythonPackage rec {

  pname = "dvc-objects";

  version = "0.21.1";

  version = "0.21.2";

  format = "pyproject";



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

    repo = pname;

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

    hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4=";

    hash = "sha256-XKfhjzN69U0qiArXJHeLcdv/sMy0gF33FVrk9DuCGLk=";

  };



  SETUPTOOLS_SCM_PRETEND_VERSION = version;