From fe046a112d3e8c8acaeb7f2e70a32c1afb9f1448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Feb 2022 18:01:09 +0100 Subject: [PATCH 1/4] python3Packages.textile: init at 4.0.2 --- .../python-modules/textile/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/textile/default.nix diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix new file mode 100644 index 000000000000..a8acf346cd60 --- /dev/null +++ b/pkgs/development/python-modules/textile/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, html5lib +, pytestCheckHook +, pythonOlder +, regex +}: + +buildPythonPackage rec { + pname = "textile"; + version = "4.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = "python-textile"; + rev = version; + hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI="; + }; + + propagatedBuildInputs = [ + html5lib + regex + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ + "textile" + ]; + + meta = with lib; { + description = "MOdule for generating web text"; + homepage = "https://github.com/textile/python-textile"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09e150fc6717..28186e72b55b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9750,6 +9750,8 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; + textile = callPackage ../development/python-modules/textile { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; From 208628765626cd4e06017ec0ebed4492473aea05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Feb 2022 18:04:10 +0100 Subject: [PATCH 2/4] python3Packages.Markups: disable failing test --- .../python-modules/Markups/default.nix | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index 1fa304f57a8a..2a0db14d96e7 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -1,29 +1,58 @@ { lib , buildPythonPackage -, fetchPypi -, python-markdown-math -, markdown , docutils +, fetchPypi +, importlib-metadata +, markdown , pygments +, pytestCheckHook +, python-markdown-math +, pythonOlder , pyyaml +, textile }: buildPythonPackage rec { - pname = "Markups"; + pname = "markups"; version = "3.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc"; + pname = "Markups"; + inherit version; + hash = "sha256-q5dHpywcZFdBjrQnbHmHGXfBOmVGGOTxLiofCZD78vw="; }; - checkInputs = [ markdown docutils pygments pyyaml ]; - propagatedBuildInputs = [ python-markdown-math ]; + propagatedBuildInputs = [ + docutils + markdown + pygments + python-markdown-math + pyyaml + textile + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; - meta = { - description = "A wrapper around various text markup languages."; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: '.selector .ch { color: #408080' not found in 'pre... + "test_get_pygments_stylesheet" + ]; + + pythonImportsCheck = [ + "markups" + ]; + + meta = with lib; { + description = "Wrapper around various text markup languages"; homepage = "https://github.com/retext-project/pymarkups"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ klntsky ]; + license = licenses.bsd3; + maintainers = with maintainers; [ klntsky ]; }; } From e6deab9c39123a125e4a5be46ef7dc1a8dcf7370 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Feb 2022 18:08:09 +0100 Subject: [PATCH 3/4] python3Packages.markups: rename --- .../development/python-modules/{Markups => markups}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/{Markups => markups}/default.nix (100%) diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/markups/default.nix similarity index 100% rename from pkgs/development/python-modules/Markups/default.nix rename to pkgs/development/python-modules/markups/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b9b3b88f272b..44c5c11ceb92 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -71,6 +71,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28186e72b55b..1c59c797b222 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4899,7 +4899,7 @@ in { markupsafe = callPackage ../development/python-modules/markupsafe { }; - Markups = callPackage ../development/python-modules/Markups { }; + markups = callPackage ../development/python-modules/markups { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; From 056b94582a4470f067c9e9e4e64bcc86fceb89ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Feb 2022 18:40:48 +0100 Subject: [PATCH 4/4] retext: 7.0.4 -> 7.2.3 - clean-up - add pythonImportsCheck --- pkgs/applications/editors/retext/default.nix | 53 ++++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 533e353a43e6..afb48ad65f4f 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,29 +1,44 @@ -{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts -# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries -# available. +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +, buildEnv +, aspellDicts + # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries + # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] }: -let - version = "7.0.4"; - pythonEnv = python3.withPackages (ps: with ps; [ - pyqt5 docutils pyenchant Markups markdown pygments chardet - ]); -in python3.pkgs.buildPythonApplication { - inherit version; +python3.pkgs.buildPythonApplication rec { pname = "retext"; + version = "7.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; repo = "retext"; rev = version; - sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; + hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA="; }; - doCheck = false; + nativeBuildInputs = [ + wrapQtAppsHook + ]; - nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ pythonEnv ]; + propagatedBuildInputs = with python3.pkgs; [ + chardet + docutils + markdown + markups + pyenchant + pygments + pyqt5 + ]; + + postPatch = '' + # Remove wheel check + sed -i -e '31,36d' setup.py + ''; postInstall = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -39,10 +54,16 @@ in python3.pkgs.buildPythonApplication { --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" ''; + doCheck = false; + + pythonImportsCheck = [ + "ReText" + ]; + meta = with lib; { + description = "Editor for Markdown and reStructuredText"; homepage = "https://github.com/retext-project/retext/"; - description = "Simple but powerful editor for Markdown and reStructuredText"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; };