diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix index 457bcf4f6525..9a5116c94d6a 100644 --- a/pkgs/development/python-modules/jsons/default.nix +++ b/pkgs/development/python-modules/jsons/default.nix @@ -1,8 +1,10 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub -, attrs , pytestCheckHook +, pythonAtLeast +, pythonOlder , typish , tzdata }: @@ -10,12 +12,15 @@ buildPythonPackage rec { pname = "jsons"; version = "1.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "jsons"; - rev = "v${version}"; - sha256 = "0sdwc57f3lwzhbcapjdbay9f8rn65rlspxa67a2i5apcgg403qpc"; + rev = "refs/tags/v${version}"; + hash = "sha256-7OIByHvsqhKFOkb1q2kuxmbkkleryavYgp/T4U5hvGk="; }; propagatedBuildInputs = [ @@ -34,6 +39,11 @@ buildPythonPackage rec { "tests/test_performance.py" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/ramonhagenaars/jsons/issues/187 + "test_dump_load_parameterized_collections" + ]; + pythonImportsCheck = [ "jsons" ]; @@ -41,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn Python objects into dicts or json strings and back"; homepage = "https://github.com/ramonhagenaars/jsons"; + changelog = "https://github.com/ramonhagenaars/jsons/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fmoda3 ]; }; diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix index c0942c701683..c05518c257f0 100644 --- a/pkgs/development/python-modules/typish/default.nix +++ b/pkgs/development/python-modules/typish/default.nix @@ -3,17 +3,22 @@ , fetchFromGitHub , numpy , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "typish"; version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "typish"; - rev = "7875850f55e2df8a9e2426e2d484ab618e347c7f"; - sha256 = "0mc5hw92f15mwd92rb2q9isc4wi7xq76449w7ph5bskcspas0wrf"; + rev = "refs/tags/v${version}"; + hash = "sha256-LnOg1dVs6lXgPTwRYg7uJ3LCdExYrCxS47UEJxKHhVU="; }; nativeCheckInputs = [ @@ -27,6 +32,11 @@ buildPythonPackage rec { "tests/functions/test_instance_of.py" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/ramonhagenaars/typish/issues/32 + "test_get_origin" + ]; + pythonImportsCheck = [ "typish" ]; @@ -34,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for checking types of objects"; homepage = "https://github.com/ramonhagenaars/typish"; + changelog = "https://github.com/ramonhagenaars/typish/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fmoda3 ]; };