From f40a383b2fe91f7e008351b00d43c89982ed4577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 16:09:58 +0100 Subject: [PATCH 1/6] python310Packages.sybil: add changelog to meta --- pkgs/development/python-modules/sybil/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 2667f0af5464..d26ffa54ce53 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automated testing for the examples in your documentation"; homepage = "https://github.com/cjw296/sybil"; + changelog = "https://github.com/simplistix/sybil/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 8906a6fc0a519a15e94b5d7430fef12e594d2a7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 16:27:46 +0100 Subject: [PATCH 2/6] python310Packages.seedir: init at 0.4.2 --- .../python-modules/seedir/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/seedir/default.nix diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix new file mode 100644 index 000000000000..8aadab61cac8 --- /dev/null +++ b/pkgs/development/python-modules/seedir/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, natsort +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "seedir"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "earnestt1234"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; + }; + + propagatedBuildInputs = [ + natsort + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "seedir" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; + + meta = with lib; { + description = "Module for for creating, editing, and reading folder tree diagrams"; + homepage = "https://github.com/earnestt1234/seedir"; + changelog = "https://github.com/earnestt1234/seedir/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c66be90368c3..4cdb7f194198 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10173,6 +10173,8 @@ self: super: with self; { securetar = callPackage ../development/python-modules/securetar { }; + seedir = callPackage ../development/python-modules/seedir { }; + seekpath = callPackage ../development/python-modules/seekpath { }; segments = callPackage ../development/python-modules/segments { }; From bd0698de5bd2be4f31911c8cd9c7205adcf7e872 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 16:34:08 +0100 Subject: [PATCH 3/6] python310Packages.sybil: 3.0.1 -> 4.0.0 Changelog: https://github.com/simplistix/sybil/blob/4.0.0/CHANGELOG.rst --- .../python-modules/sybil/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index d26ffa54ce53..e9307f894c2b 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -1,31 +1,26 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "sybil"; - version = "3.0.1"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-bwLcIgSvflohIDeSTZdPcngfbcGP08RMx85GOhIPUw0="; + src = fetchFromGitHub { + owner = "simplistix"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-9fXvQfVS3IVdOV4hbA0bEYFJU7uK0WpqJKMNBltqFTI="; }; - checkInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # Sensitive to output of other commands - "test_namespace" - "test_unittest" - ]; + # Circular dependency with testfixtures + doCheck = false; pythonImportsCheck = [ "sybil" From f6d1571c9e12ded1c3e924521fd77c0d9be1a1ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 16:40:53 +0100 Subject: [PATCH 4/6] python310Packages.testfixtures: add changelog to meta --- pkgs/development/python-modules/testfixtures/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 9f0de060d7d4..6f81f8fc8380 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of helpers and mock objects for unit tests and doc tests"; homepage = "https://github.com/Simplistix/testfixtures"; + changelog = "https://github.com/simplistix/testfixtures/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ siriobalmelli ]; }; From 0442c2e3dc1e2245013151567daa975610e1978d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 16:42:26 +0100 Subject: [PATCH 5/6] python310Packages.testfixtures: 7.0.0 -> 7.0.4 Changelog: https://github.com/simplistix/testfixtures/blob/7.0.4/CHANGELOG.rst --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 6f81f8fc8380..19f9ef7eadcb 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.0.0"; + version = "7.0.4"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jsrFowh5NFFkBZTZykLOibmHcR4eTJMShVMh7CH2zLQ="; + hash = "sha256-xSaqiXjBAC8FnxUsSt43WMShJBjfqyspdUrmIwyvPQQ="; }; checkInputs = [ From ffb3415f02bc2b8bc222e2078c7ace8377272235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 17:37:07 +0100 Subject: [PATCH 6/6] python310Packages.sybil: remove whitespace --- pkgs/development/python-modules/sybil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index e9307f894c2b..d1bb2994f779 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-9fXvQfVS3IVdOV4hbA0bEYFJU7uK0WpqJKMNBltqFTI="; }; - # Circular dependency with testfixtures + # Circular dependency with testfixtures doCheck = false; pythonImportsCheck = [