summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-12-09 03:14:28 +0100
committerGitHub <noreply@github.com>2020-12-09 03:14:28 +0100
commit5cebf94abe17fb8ae65f90ad41e122e2f4cf8617 (patch)
tree6c77813ad23e1f1e576ed4fef06f994c558fc78e /pkgs
parent3537ea7a8358abe11d07223812305faebf3d5074 (diff)
parentb2d64e2c28417df522359b6bf0b3f140192aba26 (diff)
Merge pull request #106311 from bhipple/feature/jupytext
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/jupytext/default.nix9
-rw-r--r--pkgs/development/python-modules/markdown-it-py/default.nix47
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 55 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 6f4c188c2f75..ba627449c123 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
-, mock
+, markdown-it-py
, nbformat
, pytest
, pyyaml
@@ -10,16 +10,19 @@ buildPythonPackage rec {
pname = "jupytext";
version = "1.7.1";
+ disabled = isPy27;
+
src = fetchPypi {
inherit pname version;
sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40";
};
propagatedBuildInputs = [
- pyyaml
+ markdown-it-py
nbformat
+ pyyaml
toml
- ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows
+ ];
checkInputs = [
pytest
diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
new file mode 100644
index 000000000000..2d915762fca2
--- /dev/null
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -0,0 +1,47 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder
+, attrs
+, coverage
+, psutil
+, pytest-benchmark
+}:
+
+buildPythonPackage rec {
+ pname = "markdown-it-py";
+ version = "0.5.6";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "executablebooks";
+ repo = "markdown-it-py";
+ rev = "v${version}";
+ sha256 = "1m9g8xvd7jiz80x9hl8bw9x0ppndqq5nlcn5y8bjxnfj5s31vpbi";
+ };
+
+ propagatedBuildInputs = [ attrs ];
+
+ checkInputs = [
+ coverage
+ pytest-benchmark
+ psutil
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Requires the unpackaged pytest-regressions fixture plugin
+ "test_amsmath"
+ "test_container"
+ "test_deflist"
+ "test_dollarmath"
+ "test_spec"
+ "test_texmath"
+ ];
+
+ meta = with lib; {
+ description = "Markdown parser done right";
+ homepage = "https://markdown-it-py.readthedocs.io/en/latest";
+ changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bhipple ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34165a22dece..2ff6441631c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3703,6 +3703,8 @@ in {
else
callPackage ../development/python-modules/markdown/3_1.nix { };
+ markdown-it-py = callPackage ../development/python-modules/markdown-it-py { };
+
markdown-macros = callPackage ../development/python-modules/markdown-macros { };
markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { };