Merge pull request #131415 from marsam/update-xonsh

xonsh: 0.9.27 -> 0.10.1
This commit is contained in:
Sandro 2021-07-28 11:44:06 +00:00 committed by GitHub
commit d0796a6c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ lib, stdenv
{ lib
, fetchFromGitHub
, python3Packages
, glibcLocales
@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.27";
version = "0.10.1";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "09w6bl3qsygfs2ph2r423ndnbd74bzf67vp8587h2dkkfxlzjbad";
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "03ahay2rl98a9k4pqkxksmj6mcg554jnbhw9jh8cyvjrygrpcpch";
};
LC_ALL = "en_US.UTF-8";
@ -31,15 +31,31 @@ python3Packages.buildPythonApplication rec {
patchShebangs .
'';
doCheck = !stdenv.isDarwin;
disabledTests = [
# fails on sandbox
"test_colorize_file"
"test_loading_correctly"
"test_no_command_path_completion"
# fails on non-interactive shells
"test_capture_always"
"test_casting"
"test_command_pipeline_capture"
"test_dirty_working_directory"
"test_man_completion"
"test_vc_get_branch"
];
checkPhase = ''
HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks and not test_command_pipeline_capture and not test_git_dirty_working_directory_includes_untracked and not test_dirty_working_directory and not test_vc_get_branch'
HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5
HOME=$TMPDIR pytest -k 'test_ptk_highlight'
disabledTestPaths = [
# fails on non-interactive shells
"tests/prompt/test_gitstatus.py"
"tests/completers/test_bash_completer.py"
];
preCheck = ''
HOME=$TMPDIR
'';
checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ];
checkInputs = [ glibcLocales git ] ++ (with python3Packages; [ pytestCheckHook pytest-subprocess ]);
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ];
@ -49,7 +65,6 @@ python3Packages.buildPythonApplication rec {
changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ spwhitt vrthra ];
platforms = platforms.all;
};
passthru = {