From ca81442a99ff2acc4a669cea3ff0555da83382e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:25:02 +0100 Subject: [PATCH 1/5] python310Packages.dvc-objects: add changelog to meta --- pkgs/development/python-modules/dvc-objects/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index ec02d79b3ab8..45f5eccbc4d2 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; + changelog = "https://github.com/iterative/dvc-objects/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From d37f257e6baf1621725f7e8b7f8d555a12d07a7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:26:17 +0100 Subject: [PATCH 2/5] python310Packages.dvc-objects: 0.14.0 -> 0.19.0 Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/0.14.0...0.19.0 Changelog: https://github.com/iterative/dvc-objects/releases/tag/0.19.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 45f5eccbc4d2..8af21a696a5a 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.14.0"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; + hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b84d40d5e1f59a619921e5d7ee7502cdb25e6ff2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:28:00 +0100 Subject: [PATCH 3/5] python310Packages.dvc-data: add changelog to meta --- pkgs/development/python-modules/dvc-data/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index db7a8fe62fc1..29a8d835b63d 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; homepage = "https://github.com/iterative/dvc-data"; + changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 6273b43743a7df55c4fcb25e816d63f6375c78c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:09:42 +0100 Subject: [PATCH 4/5] python310Packages.sqltrie: init at 0.0.26 --- .../python-modules/sqltrie/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/sqltrie/default.nix diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix new file mode 100644 index 000000000000..99ccab32acde --- /dev/null +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -0,0 +1,52 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pygtrie +, orjson +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sqltrie"; + version = "0.0.26"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-QxQyxGOt6K3Q/ShdTMgI72lJML4J1+zZj1OoKyPAYVs="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + orjson + pygtrie + ]; + + # nox is not available at the moment + doCheck = false; + + pythonImportsCheck = [ + "sqltrie" + ]; + + meta = with lib; { + description = "DVC's data management subsystem"; + homepage = "https://github.com/iterative/sqltrie"; + changelog = "https://github.com/iterative/sqltrie/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e9..69cbea823942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10890,6 +10890,8 @@ self: super: with self; { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + sqltrie = callPackage ../development/python-modules/sqltrie { }; + srp = callPackage ../development/python-modules/srp { }; srpenergy = callPackage ../development/python-modules/srpenergy { }; From 85256447c127db2b3e1671a26158f8677dc080ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:10:15 +0100 Subject: [PATCH 5/5] python310Packages.dvc-data: 0.28.4 -> 0.35.1 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.28.4...0.35.1 Changelog: https://github.com/iterative/dvc-data/releases/tag/0.35.1 --- pkgs/development/python-modules/dvc-data/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 29a8d835b63d..a5f557c2cc6f 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -8,13 +8,14 @@ , nanotime , pygtrie , pythonOlder -, shortuuid , setuptools-scm +, shortuuid +, sqltrie }: buildPythonPackage rec { pname = "dvc-data"; - version = "0.28.4"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; + hash = "sha256-MyYRkClbJDcMgwAHcESY0Bo7LgAFpDtkOVmVRUJ7jME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,6 +41,7 @@ buildPythonPackage rec { nanotime pygtrie shortuuid + sqltrie ]; # Tests depend on upath which is unmaintained and only available as wheel