Merge pull request #301861 from fabaff/pprintpp-fix

python311Packages.pprintpp: disable failing tests

authored by Fabian Affolter and committed by GitHub 8a3f23ca 76422a76

+97 -83
+22 -24
pkgs/development/python-modules/audio-metadata/default.nix
··· 1 - { lib 2 - , attrs 3 - , bidict 4 - , bitstruct 5 - , buildPythonPackage 6 - , fetchFromGitHub 7 - , fetchpatch 8 - , more-itertools 9 - , poetry-core 10 - , pprintpp 11 - , pythonOlder 12 - , pythonRelaxDepsHook 13 - , tbm-utils 1 + { 2 + lib, 3 + attrs, 4 + bidict, 5 + bitstruct, 6 + buildPythonPackage, 7 + fetchFromGitHub, 8 + fetchpatch, 9 + more-itertools, 10 + poetry-core, 11 + pprintpp, 12 + pythonOlder, 13 + pythonRelaxDepsHook, 14 + tbm-utils, 14 15 }: 15 16 16 17 buildPythonPackage rec { 17 18 pname = "audio-metadata"; 18 19 version = "0.11.1"; 19 - format = "pyproject"; 20 + pyproject = true; 20 21 21 22 disabled = pythonOlder "3.7"; 22 23 23 24 src = fetchFromGitHub { 24 25 owner = "thebigmunch"; 25 - repo = pname; 26 + repo = "audio-metadata"; 26 27 rev = "refs/tags/${version}"; 27 28 hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; 28 29 }; ··· 41 42 "more-itertools" 42 43 ]; 43 44 44 - nativeBuildInputs = [ 45 - poetry-core 46 - pythonRelaxDepsHook 47 - ]; 45 + build-system = [ poetry-core ]; 46 + 47 + nativeBuildInputs = [ pythonRelaxDepsHook ]; 48 48 49 - propagatedBuildInputs = [ 49 + dependencies = [ 50 50 attrs 51 51 bidict 52 52 bitstruct ··· 58 58 # Tests require ward which is not ready to be used 59 59 doCheck = false; 60 60 61 - pythonImportsCheck = [ 62 - "audio_metadata" 63 - ]; 61 + pythonImportsCheck = [ "audio_metadata" ]; 64 62 65 63 meta = with lib; { 64 + description = "Library for handling the metadata from audio files"; 66 65 homepage = "https://github.com/thebigmunch/audio-metadata"; 67 - description = "A library for reading and, in the future, writing metadata from audio files"; 68 66 changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; 69 67 license = licenses.mit; 70 68 maintainers = with maintainers; [ jakewaksbaum ];
+25 -16
pkgs/development/python-modules/pprintpp/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , fetchpatch 4 - , fetchPypi 5 - , nose 6 - , parameterized 7 - , python 8 - , pythonOlder 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchpatch, 5 + fetchPypi, 6 + parameterized, 7 + pytestCheckHook, 8 + pynose, 9 + python, 10 + pythonOlder, 11 + setuptools, 9 12 }: 10 13 11 14 buildPythonPackage rec { 12 15 pname = "pprintpp"; 13 16 version = "0.4.0"; 14 - format = "setuptools"; 17 + pyproject = true; 15 18 16 19 disabled = pythonOlder "3.7"; 17 20 ··· 34 37 }) 35 38 ]; 36 39 40 + build-system = [ setuptools ]; 41 + 37 42 nativeCheckInputs = [ 38 - nose 39 43 parameterized 44 + pynose 45 + pytestCheckHook 40 46 ]; 41 47 42 - checkPhase = '' 43 - ${python.interpreter} test.py 44 - ''; 48 + pythonImportsCheck = [ "pprintpp" ]; 45 49 46 - pythonImportsCheck = [ 47 - "pprintpp" 50 + pytestFlagsArray = [ "test.py" ]; 51 + 52 + disabledTests = [ 53 + # AttributeError: 'EncodedFile' object has no attribute 'getvalue' 54 + "test_pp" 55 + "test_pp_pprint" 56 + "test_fmt" 48 57 ]; 49 58 50 59 meta = with lib; { 51 60 description = "A drop-in replacement for pprint that's actually pretty"; 52 - mainProgram = "pypprint"; 53 61 homepage = "https://github.com/wolever/pprintpp"; 54 62 changelog = "https://github.com/wolever/pprintpp/blob/${version}/CHANGELOG.txt"; 55 63 license = licenses.bsd2; 56 64 maintainers = with maintainers; [ jakewaksbaum ]; 65 + mainProgram = "pypprint"; 57 66 }; 58 67 }
+44 -31
pkgs/development/python-modules/tbm-utils/default.nix
··· 1 - { stdenv 2 - , lib 3 - , buildPythonPackage 4 - , fetchFromGitHub 5 - , attrs 6 - , pendulum 7 - , poetry-core 8 - , pprintpp 9 - , pytestCheckHook 10 - , pythonRelaxDepsHook 11 - , wrapt 1 + { 2 + lib, 3 + stdenv, 4 + attrs, 5 + buildPythonPackage, 6 + fetchFromGitHub, 7 + fetchpatch, 8 + pendulum, 9 + poetry-core, 10 + pprintpp, 11 + pytestCheckHook, 12 + pythonOlder, 13 + pythonRelaxDepsHook, 14 + wrapt, 12 15 }: 13 16 14 17 buildPythonPackage rec { 15 18 pname = "tbm-utils"; 16 19 version = "2.6.0"; 17 - format = "pyproject"; 20 + pyproject = true; 21 + 22 + disabled = pythonOlder "3.9"; 18 23 19 24 src = fetchFromGitHub { 20 25 owner = "thebigmunch"; 21 - repo = pname; 26 + repo = "tbm-utils"; 22 27 rev = "refs/tags/${version}"; 23 28 hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA="; 24 29 }; 25 30 31 + patches = [ 32 + # Migrate to pendulum > 3, https://github.com/thebigmunch/tbm-utils/pull/3 33 + (fetchpatch { 34 + name = "support-pendulum-3.patch"; 35 + url = "https://github.com/thebigmunch/tbm-utils/commit/473534fae2d9a8dea9100cead6c54cab3f5cd0cd.patch"; 36 + hash = "sha256-3T0KhSmO9r1vM67FWEnTZMQV4b5jS2xtPHI0t9NnCmI="; 37 + }) 38 + (fetchpatch { 39 + name = "update-testsupport-pendulum-3.patch"; 40 + url = "https://github.com/thebigmunch/tbm-utils/commit/a0331d0c15f11cd26bfbb42eebd17296167161ed.patch"; 41 + hash = "sha256-KG6yfnnBltavbNvIBTdbK+CPXwZTLYl14925RY2a8vs="; 42 + }) 43 + ]; 44 + 26 45 postPatch = '' 27 46 substituteInPlace pyproject.toml \ 28 - --replace 'poetry>=1.0.0' 'poetry-core' \ 29 - --replace 'poetry.masonry.api' 'poetry.core.masonry.api' 47 + --replace-fail 'poetry>=1.0.0' 'poetry-core' \ 48 + --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' 30 49 ''; 31 50 32 - nativeBuildInputs = [ 33 - poetry-core 34 - pythonRelaxDepsHook 35 - ]; 51 + pythonRelaxDeps = [ "attrs" ]; 52 + 53 + build-system = [ poetry-core ]; 54 + 55 + nativeBuildInputs = [ pythonRelaxDepsHook ]; 36 56 37 57 propagatedBuildInputs = [ 38 58 attrs ··· 41 61 wrapt 42 62 ]; 43 63 44 - pythonRelaxDeps = [ 45 - "attrs" 46 - ]; 47 - 48 - nativeCheckInputs = [ 49 - pytestCheckHook 50 - ]; 64 + nativeCheckInputs = [ pytestCheckHook ]; 51 65 52 66 disabledTests = lib.optionals stdenv.isDarwin [ 53 67 # Skip on macOS because /etc/localtime is accessed through the pendulum ··· 63 77 "tests/test_misc.py" 64 78 ]; 65 79 66 - pythonImportsCheck = [ 67 - "tbm_utils" 68 - ]; 80 + pythonImportsCheck = [ "tbm_utils" ]; 69 81 70 - meta = { 82 + meta = with lib; { 71 83 description = "A commonly-used set of utilities"; 72 84 homepage = "https://github.com/thebigmunch/tbm-utils"; 73 85 changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; 74 - license = [ lib.licenses.mit ]; 86 + license = licenses.mit; 87 + maintainers = with maintainers; [ ]; 75 88 }; 76 89 }
+6 -12
pkgs/development/python-modules/ward/default.nix
··· 9 9 , poetry-core 10 10 , pprintpp 11 11 , pythonOlder 12 - , pythonRelaxDepsHook 13 12 , rich 14 13 , tomli 15 14 }: 16 15 17 16 buildPythonPackage rec { 18 17 pname = "ward"; 19 - version = "0.67.0b0"; 20 - format = "pyproject"; 18 + version = "0.68.0b0"; 19 + pyproject = true; 21 20 22 21 disabled = pythonOlder "3.8"; 23 22 24 23 src = fetchFromGitHub { 25 24 owner = "darrenburns"; 26 - repo = pname; 25 + repo = "ward"; 27 26 rev = "refs/tags/release%2F${version}"; 28 27 hash = "sha256-4dEMEEPySezgw3dIcYMl56HrhyaYlql9JvtamOn7Y8g="; 29 28 }; 30 29 31 - pythonRelaxDeps = [ 32 - "rich" 33 - ]; 34 - 35 - nativeBuildInputs = [ 30 + build-system = [ 36 31 poetry-core 37 - pythonRelaxDepsHook 38 32 ]; 39 33 40 - propagatedBuildInputs = [ 34 + dependencies = [ 41 35 click 42 36 rich 43 37 tomli ··· 57 51 58 52 meta = with lib; { 59 53 description = "Test framework for Python"; 60 - mainProgram = "ward"; 61 54 homepage = "https://github.com/darrenburns/ward"; 62 55 changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; 63 56 license = licenses.mit; 64 57 maintainers = with maintainers; [ fab ]; 58 + mainProgram = "ward"; 65 59 }; 66 60 }