From f82ceb1c489cf552e668e5a6411ae60a4a475fd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Aug 2022 10:52:40 +0200 Subject: [PATCH 1/2] python310Packages.dvc-http: init at 0.0.1 --- .../python-modules/dvc-http/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/dvc-http/default.nix diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix new file mode 100644 index 000000000000..293504279625 --- /dev/null +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp-retry +, buildPythonPackage +, dvc +, fetchFromGitHub +, fsspec +, pythonOlder +, pythonRelaxDepsHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dvc-http"; + version = "0.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = version; + hash = "sha256-lZctTmMMF9OMvzMbTYH1d/twW284/IcO8ICb/ennFQA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + + propagatedBuildInputs = [ + dvc + fsspec + aiohttp-retry + ]; + + # Currently it's not possible to run the tests + # ModuleNotFoundError: No module named 'dvc.testing' + doCheck = false; + + pythonImportsCheck = [ + "dvc_http" + ]; + + meta = with lib; { + description = "HTTP plugin for dvc"; + homepage = "https://github.com/iterative/dvc-http"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51cbc01b565a..89f54f154e1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2733,6 +2733,8 @@ in { dvc-data = callPackage ../development/python-modules/dvc-data { }; + dvc-http = callPackage ../development/python-modules/dvc-http { }; + dvc-objects = callPackage ../development/python-modules/dvc-objects { }; dvc-render = callPackage ../development/python-modules/dvc-render { }; From 98fe000b3db44821eee3e92173a7906cbffda828 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 01:01:42 +0100 Subject: [PATCH 2/2] python310Packages.dvc-http: 0.0.1 -> 2.30.2 Changelog: https://github.com/iterative/dvc-http/releases/tag/2.30.2 --- pkgs/development/python-modules/dvc-http/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index 293504279625..cb812d850c16 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -1,8 +1,8 @@ { lib , aiohttp-retry , buildPythonPackage -, dvc , fetchFromGitHub +, dvc-objects , fsspec , pythonOlder , pythonRelaxDepsHook @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-http"; - version = "0.0.1"; + version = "2.30.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,19 +19,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = version; - hash = "sha256-lZctTmMMF9OMvzMbTYH1d/twW284/IcO8ICb/ennFQA="; + rev = "refs/tags/${version}"; + hash = "sha256-IlgJEnS+rHSg5cw7SCc3vVtG1mJA5voGViya7nkpL2M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; propagatedBuildInputs = [ - dvc + dvc-objects fsspec aiohttp-retry ]; @@ -47,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP plugin for dvc"; homepage = "https://github.com/iterative/dvc-http"; + changelog = "https://github.com/iterative/dvc-http/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; };