From d6521c5ef7efbdb01f35b5e60b7f2a2625bc7b06 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:00:35 -0500 Subject: [PATCH 1/6] mkdocs: move to python3Packages.mkdocs --- .../{tools/documentation => python-modules}/mkdocs/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/development/{tools/documentation => python-modules}/mkdocs/default.nix (100%) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix similarity index 100% rename from pkgs/development/tools/documentation/mkdocs/default.nix rename to pkgs/development/python-modules/mkdocs/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87a04b56c607..c8e6e7060ba6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15103,7 +15103,7 @@ with pkgs; mkcert = callPackage ../development/tools/misc/mkcert { }; - mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mkdocs = with python3Packages; toPythonApplication mkdocs; mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c9f6fc733f3..90ff72621b4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5037,6 +5037,8 @@ in { mizani = callPackage ../development/python-modules/mizani { }; + mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; From 58a2318a576b6ce5483ed724594a6092ad73e16a Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:03:30 -0500 Subject: [PATCH 2/6] python3Packages.mkdocs: sort and categorize inputs --- .../python-modules/mkdocs/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index f7774cc7127e..81c911c0e8fa 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -1,11 +1,28 @@ -{ lib -, python3 +{ + # eval time deps + lib +, buildPythonPackage , fetchFromGitHub +, fetchpatch +, pythonOlder + # runtime deps +, click +, ghp-import +, importlib-metadata +, jinja2 +, markdown +, mergedeep +, packaging +, pyyaml +, pyyaml-env-tag +, watchdog +# testing deps +, Babel +, mock +, pytestCheckHook }: -with python3.pkgs; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs"; version = "1.2.1"; disabled = pythonOlder "3.6"; From 60d94441fd3864922cb8e43c0cdc8db6b16ac280 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:21:50 -0500 Subject: [PATCH 3/6] python3Packages.mkdocs: 1.2.1 -> 1.2.3 --- pkgs/development/python-modules/mkdocs/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 81c911c0e8fa..e863c6e7a3c0 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -24,16 +24,24 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.2.1"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JF3Zz1ObxeKsIF0pa8duJxqjLgMvmWsWMApHT43Z+EY="; + sha256 = "sha256-LBw2ftGyeNvARQ8xiYUho8BiQh+aIEqROP51gKvNxEo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/mkdocs/mkdocs/commit/c93fc91e4dc0ef33e2ea418aaa32b0584a8d354a.patch"; + sha256 = "sha256-7uLIuQOt6KU/+iS9cwhXkWPAHzZkQdMyNBxSMut5WK4="; + excludes = [ "tox.ini" ]; + }) + ]; + propagatedBuildInputs = [ click jinja2 From 173a62e890737bb5195bd308095762d05f5690f4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:22:51 -0500 Subject: [PATCH 4/6] python3Packages.mkdocs: remove unnecessary postPatch step --- pkgs/development/python-modules/mkdocs/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index e863c6e7a3c0..a9c9591abfac 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -61,11 +61,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Remove test due to missing requirement - rm mkdocs/tests/theme_tests.py - ''; - pytestFlagsArray = [ "mkdocs/tests/*.py" ]; disabledTests = [ From 10d33eee2de8404805cef918511f40f1541d49d7 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:48:11 -0500 Subject: [PATCH 5/6] python3Packages.mkdocs: fix indent --- pkgs/development/python-modules/mkdocs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index a9c9591abfac..c73ed266f51d 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -16,7 +16,7 @@ , pyyaml , pyyaml-env-tag , watchdog -# testing deps + # testing deps , Babel , mock , pytestCheckHook From ba480d77224a53550d538071ea672f4d4ec167b2 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:48:26 -0500 Subject: [PATCH 6/6] python3Packages.mkdocs: get tests passing --- .../development/python-modules/mkdocs/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index c73ed266f51d..7d4f1cc66c6e 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -58,15 +58,18 @@ buildPythonPackage rec { checkInputs = [ Babel mock - pytestCheckHook ]; - pytestFlagsArray = [ "mkdocs/tests/*.py" ]; - disabledTests = [ - # Don't start a test server - "testing_server" - ]; + checkPhase = '' + set -euo pipefail + + runHook preCheck + + python -m unittest discover -v -p '*tests.py' mkdocs --top-level-directory . + + runHook postCheck + ''; pythonImportsCheck = [ "mkdocs" ];