diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index af221199c910..539c3324204e 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -1,39 +1,55 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, loguru , mbstrdecoder -, typepy , pytestCheckHook +, pythonOlder +, tcolorpy , termcolor +, typepy }: buildPythonPackage rec { pname = "dataproperty"; - version = "0.55.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + rev = "refs/tags/v${version}"; + hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8="; }; - propagatedBuildInputs = [ mbstrdecoder typepy ]; + propagatedBuildInputs = [ + mbstrdecoder + typepy + tcolorpy + ] ++ typepy.optional-dependencies.datetime; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ termcolor ]; + passthru.optional-dependencies = { + logging = [ + loguru + ]; + }; - # Tests fail, even on non-nixos - pytestFlagsArray = [ - "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + nativeCheckInputs = [ + pytestCheckHook + termcolor + ]; + + pythonImportsCheck = [ + "dataproperty" ]; meta = with lib; { + description = "Library for extracting properties from data"; homepage = "https://github.com/thombashi/dataproperty"; - description = "A library for extracting properties from data"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 8a1597b597ec..86af2ae0846f 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -105,11 +105,13 @@ buildPythonPackage rec { "pathvalidate" ]; - # Circular dependency disabledTests = [ + # Circular dependency "test_normal_from_file" "test_normal_from_text" "test_normal_clear_theme" + # Test compares CLI output + "test_normal" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index a1d9e7df1534..c5c393b29c01 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -26,14 +26,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder - python-dateutil - pytz - packaging ]; + passthru.optional-dependencies = { + datetime = [ + python-dateutil + pytz + packaging + ]; + }; + nativeCheckInputs = [ pytestCheckHook tcolorpy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "typepy" ]; meta = with lib; {