From 45528dec8ba3cae82561010081ad594cb506b9ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 09:48:48 +0100 Subject: [PATCH 1/5] python3Packages.mdformat: 0.7.10 -> 0.7.11 --- .../python-modules/mdformat/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 101ed2aa1346..02aafd3302a9 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.10"; + version = "0.7.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-Zw7ZGV/Hd0MRxxQVwkjtE6MJXNLQ0A0PJlQr4x9h2ww="; + sha256 = "sha256-EhMoGSCtlEcm1+1aHn9DhBnLQvolhq62SMF/AdaY1/E="; }; nativeBuildInputs = [ @@ -41,7 +41,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "mdformat" ]; + disabledTests = [ + # AssertionError + "test_no_codeblock_trailing_newline" + # Issue with upper/lower case + "default_style.md-options0" + ]; + + pythonImportsCheck = [ + "mdformat" + ]; meta = with lib; { description = "CommonMark compliant Markdown formatter"; From baac79cc39b0e3deddea678d52e21f7d47a4ed87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 10:04:18 +0100 Subject: [PATCH 2/5] python3Packages.mdurl: init at 0.1.0 --- .../python-modules/mdurl/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mdurl/default.nix diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix new file mode 100644 index 000000000000..37b3e9ad56ac --- /dev/null +++ b/pkgs/development/python-modules/mdurl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdurl"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-AVklWFc4o5R9OzS9BYauuOaxm89P/Ih5l3Vrb2P0El4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mdurl" + ]; + + meta = with lib; { + description = "URL utilities for markdown-it"; + homepage = "https://github.com/hukkin/mdurl"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3895ae338923..6569bf250ddb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4761,6 +4761,8 @@ in { mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + mdurl = callPackage ../development/python-modules/mdurl { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; From 6041dd24127144482f1bea7a131ef3d609b7d0e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 10:10:09 +0100 Subject: [PATCH 3/5] python3Packages.markdown-it-py: 1.1.0 -> 2.0.0 --- .../python-modules/markdown-it-py/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 8ed57f3ff031..f056c104e759 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,19 +1,20 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder -, attrs , linkify-it-py +, mdurl , psutil , pytest-benchmark , pytest-regressions +, pytestCheckHook +, pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,11 +23,16 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; + sha256 = "sha256-ahg+aAVpAh07PZ1mfrne0EP9K2J4tb8eLp5XXFpWp00="; }; - propagatedBuildInputs = [ attrs linkify-it-py ] - ++ lib.optional (pythonOlder "3.8") typing-extensions; + propagatedBuildInputs = [ + attrs + linkify-it-py + mdurl + ] ++ lib.optional (pythonOlder "3.8") [ + typing-extensions + ]; checkInputs = [ psutil @@ -34,11 +40,14 @@ buildPythonPackage rec { pytest-regressions pytestCheckHook ]; - pythonImportsCheck = [ "markdown_it" ]; + + pythonImportsCheck = [ + "markdown_it" + ]; meta = with lib; { - description = "Markdown parser done right"; - homepage = "https://markdown-it-py.readthedocs.io/en/latest"; + description = "Markdown parser in Python"; + homepage = "https://markdown-it-py.readthedocs.io/"; changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; From 4fc9618a98f9d76230e2e2d394d7fff3d7e6a941 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 10:18:32 +0100 Subject: [PATCH 4/5] python3Packages.mdit-py-plugins: 0.2.8 -> 0.3.0 --- .../python-modules/mdit-py-plugins/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 9c5705dbc408..03a64588f85b 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.2.8"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,13 +18,21 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - hash = "sha256-MXQjaVDuguGbmby6BQnrTdpq6Mih3HabXuyFxf9jB18="; + sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; }; - propagatedBuildInputs = [ markdown-it-py ]; + propagatedBuildInputs = [ + markdown-it-py + ]; - checkInputs = [ pytestCheckHook pytest-regressions ]; - pythonImportsCheck = [ "mdit_py_plugins" ]; + checkInputs = [ + pytestCheckHook + pytest-regressions + ]; + + pythonImportsCheck = [ + "mdit_py_plugins" + ]; meta = with lib; { description = "Collection of core plugins for markdown-it-py"; From d7ffe95f6437e32a2188dde24cab593b8f50be8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Dec 2021 10:43:26 +0100 Subject: [PATCH 5/5] python3Packages.jupytext: 1.11.2 -> 1.13.2 --- .../python-modules/jupytext/default.nix | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 89d8c288a795..08582d662262 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";