Merge pull request #333880 from jcaesar/pr-15

python312Pakcages.python-fx: 0.3.1 -> 0.3.2, enable tests
This commit is contained in:
Fabian Affolter 2024-08-13 22:44:17 +02:00 committed by GitHub
commit e7df119289
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +1,6 @@
{ {
lib, lib,
stdenv,
antlr4-python3-runtime, antlr4-python3-runtime,
asciimatics, asciimatics,
buildPythonPackage, buildPythonPackage,
@ -21,7 +22,6 @@
antlr4, antlr4,
pyyaml, pyyaml,
setuptools, setuptools,
six,
urwid, urwid,
parameterized, parameterized,
wcwidth, wcwidth,
@ -30,8 +30,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-fx"; pname = "python-fx";
version = "0.3.1"; version = "0.3.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -39,20 +39,20 @@ buildPythonPackage rec {
owner = "cielong"; owner = "cielong";
repo = "pyfx"; repo = "pyfx";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-BXKH3AlYMNbMREW5Qx72PrbuZdXlmVS+knWWu/y9PsA="; hash = "sha256-Q5ihWnoa7nf4EkrY4SgrwjaNvTva4RdW9GRbnbsPXPc=";
}; };
postPatch = '' postPatch = ''
rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} rm src/pyfx/model/common/jsonpath/*.py # upstream checks in generated files, remove to ensure they were regenerated
antlr -Dlanguage=Python3 -visitor -o src/pyfx/model/common/jsonpath/ *.g4 antlr -Dlanguage=Python3 -visitor src/pyfx/model/common/jsonpath/*.g4
rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} # no need to install
''; '';
pythonRelaxDeps = true; pythonRelaxDeps = true;
nativeBuildInputs = [ build-system = [ setuptools ];
antlr4
setuptools nativeBuildInputs = [ antlr4 ];
];
propagatedBuildInputs = [ propagatedBuildInputs = [
antlr4-python3-runtime antlr4-python3-runtime
@ -70,7 +70,6 @@ buildPythonPackage rec {
pyfiglet pyfiglet
pyperclip pyperclip
pyyaml pyyaml
six
urwid urwid
wcwidth wcwidth
yamale yamale
@ -81,20 +80,17 @@ buildPythonPackage rec {
parameterized parameterized
]; ];
# antlr4 issue prevents us from running the tests # FAILED tests/test_event_loops.py::TwistedEventLoopTest::test_run - AssertionError: 'callback called with future outcome: True' not found in ['...
# https://github.com/antlr/antlr4/issues/4041 doCheck = !stdenv.isDarwin;
doCheck = false;
# pythonImportsCheck = [ pythonImportsCheck = [ "pyfx" ];
# "pyfx"
# ];
meta = with lib; { meta = with lib; {
description = "Module to view JSON in a TUI"; description = "Module to view JSON in a TUI";
mainProgram = "pyfx";
homepage = "https://github.com/cielong/pyfx"; homepage = "https://github.com/cielong/pyfx";
changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}"; changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
mainProgram = "pyfx";
}; };
} }