From d7ffe95f6437e32a2188dde24cab593b8f50be8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 10:43:26 +0100 Subject: python3Packages.jupytext: 1.11.2 -> 1.13.2 --- .../python-modules/jupytext/default.nix | 42 ++++++++++++++++------ 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 89d8c288a79..08582d66226 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,23 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , GitPython -, jupyter-packaging , jupyter-client +, jupyter-packaging , jupyterlab , markdown-it-py , mdit-py-plugins , nbformat , notebook , pytestCheckHook +, pythonOlder , pyyaml , toml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.11.2"; + version = "1.13.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,10 +26,14 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - hash = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; + sha256 = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; }; - buildInputs = [ jupyter-packaging jupyterlab ]; + buildInputs = [ + jupyter-packaging + jupyterlab + ]; + propagatedBuildInputs = [ markdown-it-py mdit-py-plugins @@ -39,16 +43,32 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook GitPython jupyter-client notebook + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/mwouts/jupytext/pull/885 + substituteInPlace setup.py \ + --replace "markdown-it-py[plugins]>=1.0.0b3,<2.0.0" "markdown-it-py[plugins]>=1.0" + ''; + + preCheck = '' + # Tests that use a Jupyter notebook require $HOME to be writable + export HOME=$(mktemp -d); + ''; + + pytestFlagsArray = [ + # Pre-commit tests expect the source directory to be a Git repository + "--ignore-glob='tests/test_pre_commit_*.py'" + ]; + + pythonImportsCheck = [ + "jupytext" + "jupytext.cli" ]; - # Tests that use a Jupyter notebook require $HOME to be writable. - HOME = "$TMPDIR"; - # Pre-commit tests expect the source directory to be a Git repository. - pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ]; - pythonImportsCheck = [ "jupytext" "jupytext.cli" ]; meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; -- cgit 1.4.1