diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index 3c399770fae0..ddc75be1cf0f 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -7,26 +7,28 @@ fetchPypi, knack, setuptools-scm, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-azure"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UsvHDVQUtQIZs9sKFvaK0l2rp24/Igrr5OSbPGSYriA="; }; # Prevent circular dependency pythonRemoveDeps = [ "dvc" ]; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ adlfs azure-identity dvc-objects @@ -43,8 +45,9 @@ buildPythonPackage rec { meta = { description = "Azure plugin for dvc"; - homepage = "https://pypi.org/project/dvc-azure/${version}"; - changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}"; + homepage = "https://pypi.org/project/dvc-azure/"; + changelog = "https://github.com/iterative/dvc-azure/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index b027b1dd61a1..65df794ae3b1 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "dvc-data"; - version = "3.18.2"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { owner = "iterative"; repo = "dvc-data"; tag = finalAttrs.version; - hash = "sha256-3Zct/cOSxf8UYT4Kss4krWERrBatd5R3mcpDivsCIac="; + hash = "sha256-0kEbkauFT2cVEuFUyKYtA37Vh/cn3O5H0PdEPsl9Bkk="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-gdrive/default.nix b/pkgs/development/python-modules/dvc-gdrive/default.nix index 722c1d12e454..b8c4dbcf6061 100644 --- a/pkgs/development/python-modules/dvc-gdrive/default.nix +++ b/pkgs/development/python-modules/dvc-gdrive/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-gdrive"; version = "3.0.1"; pyproject = true; @@ -16,16 +16,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-gdrive"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oqHSMmwfR24ydJlpXGI3cCxIlF0BwNdgje5zKa0c7FA="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dvc pydrive2 ]; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Google Drive plugin for DVC"; homepage = "https://github.com/iterative/dvc-gdrive"; - changelog = "https://github.com/iterative/dvc-gdrive/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-gdrive/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index ce9895395f80..55c8866b39eb 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -7,14 +7,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-gs"; version = "3.0.2"; pyproject = true; src = fetchPypi { pname = "dvc_gs"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-c5aTwNglCjkHS6Fsfc51K7Wn/5NEQtYIH/z9ftkxO5o="; }; @@ -39,7 +39,8 @@ buildPythonPackage rec { meta = { description = "gs plugin for dvc"; homepage = "https://pypi.org/project/dvc-gs/version"; - changelog = "https://github.com/iterative/dvc-gs/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-gs/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-hdfs/default.nix b/pkgs/development/python-modules/dvc-hdfs/default.nix index 963033a1ecb7..0aedb3a6691f 100644 --- a/pkgs/development/python-modules/dvc-hdfs/default.nix +++ b/pkgs/development/python-modules/dvc-hdfs/default.nix @@ -8,7 +8,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-hdfs"; version = "3.0.0"; pyproject = true; @@ -16,16 +16,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-hdfs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Bo8+El5GC7iyT8SxaJquWFG29BOeilmEMDtTG+RkDGI="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dvc fsspec ] @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "HDFS/WebHDFS plugin for dvc"; homepage = "https://github.com/iterative/dvc-hdfs"; - changelog = "https://github.com/iterative/dvc-hdfs/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-hdfs/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index e63fa80a393e..812acb9228a4 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -6,10 +6,11 @@ dvc-objects, fsspec, funcy, + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-http"; version = "2.32.0"; pyproject = true; @@ -17,11 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-http"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ aiohttp-retry @@ -39,8 +43,8 @@ buildPythonPackage rec { meta = { description = "HTTP plugin for dvc"; homepage = "https://github.com/iterative/dvc-http"; - changelog = "https://github.com/iterative/dvc-http/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-http/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-oss/default.nix b/pkgs/development/python-modules/dvc-oss/default.nix index 3b631959777b..deff801e6def 100644 --- a/pkgs/development/python-modules/dvc-oss/default.nix +++ b/pkgs/development/python-modules/dvc-oss/default.nix @@ -4,23 +4,27 @@ dvc-objects, fetchPypi, ossfs, + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-oss"; version = "3.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-EEf3NAIvzSuW0ysGv24JIc0KZYEPf8HpsPrCmhR7apo="; }; # Prevent circular dependency pythonRemoveDeps = [ "dvc" ]; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ dvc-objects @@ -33,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Alibaba OSS plugin for dvc"; homepage = "https://pypi.org/project/dvc-oss/"; - changelog = "https://github.com/iterative/dvc-oss/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-oss/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 213d3903d5d5..ef572d0909e3 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -10,10 +10,11 @@ pytestCheckHook, pytest-mock, pytest-test-utils, + setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-render"; version = "1.0.2"; pyproject = true; @@ -21,13 +22,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-render"; - tag = version; + tag = finalAttrs.version; hash = "sha256-V4QVZu4PSOW9poT6YUWbgTjJpIJ8YUtGDAE4Ijgm5Ac="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - optional-dependencies = { + passthru.optional-dependencies = { table = [ flatten-dict tabulate @@ -44,8 +48,8 @@ buildPythonPackage rec { pytest-mock pytest-test-utils ] - ++ optional-dependencies.table - ++ optional-dependencies.markdown; + ++ finalAttrs.passthru.optional-dependencies.table + ++ finalAttrs.passthru.optional-dependencies.markdown; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; @@ -54,8 +58,8 @@ buildPythonPackage rec { meta = { description = "Library for rendering DVC plots"; homepage = "https://github.com/iterative/dvc-render"; - changelog = "https://github.com/iterative/dvc-render/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-render/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index af81d9568130..fc47f162a15f 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -1,42 +1,40 @@ { lib, - aiobotocore, - boto3, + botocore, buildPythonPackage, dvc-objects, fetchPypi, flatten-dict, + funcy, s3fs, setuptools-scm, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-s3"; version = "3.3.0"; pyproject = true; src = fetchPypi { pname = "dvc_s3"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-8dcYpE3O5Rkb60bkSt9LsiiCy46czdjyZAB4q8VkV9Q="; }; # Prevent circular dependency pythonRemoveDeps = [ "dvc" ]; - # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "aiobotocore[boto3]" "aiobotocore" - ''; - - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ - aiobotocore - boto3 + botocore dvc-objects flatten-dict + funcy s3fs ]; @@ -50,8 +48,9 @@ buildPythonPackage rec { meta = { description = "S3 plugin for dvc"; - homepage = "https://pypi.org/project/dvc-s3/${version}"; - changelog = "https://github.com/iterative/dvc-s3/releases/tag/${version}"; + homepage = "https://pypi.org/project/dvc-s3"; + changelog = "https://github.com/iterative/dvc-s3/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix index 7b000a5d0acf..85c58dff073a 100644 --- a/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/pkgs/development/python-modules/dvc-ssh/default.nix @@ -4,18 +4,19 @@ buildPythonPackage, dvc-objects, fetchPypi, + setuptools, setuptools-scm, sshfs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-ssh"; version = "4.2.2"; pyproject = true; src = fetchPypi { pname = "dvc_ssh"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-T6yTLF8ivZRE2H1Oez/9bAnMjlbZjrPG1LRDAdNTUBc="; }; @@ -24,7 +25,10 @@ buildPythonPackage rec { "dvc" ]; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ bcrypt @@ -51,8 +55,9 @@ buildPythonPackage rec { meta = { description = "SSH plugin for dvc"; - homepage = "https://pypi.org/project/dvc-ssh/${version}"; - changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${version}"; + homepage = "https://pypi.org/project/dvc-ssh/"; + changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 57819113dc07..e838e5f41a4e 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -9,11 +9,12 @@ pytest-mock, pytest-test-utils, pytestCheckHook, + setuptools, setuptools-scm, shortuuid, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-task"; version = "0.40.2"; pyproject = true; @@ -21,11 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = "dvc-task"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ celery @@ -53,8 +57,8 @@ buildPythonPackage rec { meta = { description = "Celery task queue used in DVC"; homepage = "https://github.com/iterative/dvc-task"; - changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}"; + changelog = "https://github.com/iterative/dvc-task/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dvc-webhdfs/default.nix b/pkgs/development/python-modules/dvc-webhdfs/default.nix index 01703e0e5356..818b3fa1e8e0 100644 --- a/pkgs/development/python-modules/dvc-webhdfs/default.nix +++ b/pkgs/development/python-modules/dvc-webhdfs/default.nix @@ -9,13 +9,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-webhdfs"; version = "3.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bolIQ9Fc52agXGFt7anZvDYSSOk7+eozi5lublHqD+o="; }; @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = { description = "Webhdfs plugin for dvc"; homepage = "https://pypi.org/project/dvc-webhdfs/"; + changelog = "https://github.com/iterative/dvc-webhdfs/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +})