Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pythonPackages.Nikola: fix tests #95549

Closed
wants to merge 1 commit into from
Closed

pythonPackages.Nikola: fix tests #95549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkgs/development/python-modules/Nikola/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,11 @@ buildPythonPackage rec {
sha256 = "2e5c8305ec4423b56af2223336c3309e5c9b8c96df0d6fde46d26cff4c5d6f1a";
};

patchPhase = ''
# upstream added bound so that requires.io doesn't send mails about update
# nikola should work with markdown 3.0: https://github.com/getnikola/nikola/pull/3175#issue-220147596
sed -i 's/Markdown>.*/Markdown/' requirements.txt
'';
# Remove this patch when upgrading to Nikola>=8.1.0
patches = [ ./fix_markdown_test.patch ];

checkPhase = ''
LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test .
LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test tests/
'';

meta = {
Expand Down
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/Nikola/fix_markdown_test.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 226e8a726e85525fb22664d9d76f4fe1729cf51d Mon Sep 17 00:00:00 2001
From: Chris Warrick <[email protected]>
Date: Fri, 7 Feb 2020 18:00:04 +0100
Subject: [PATCH] Update tests for Markdown==3.2 output change

This minor change does not affect the appearance of Nikola's output.
---
tests/test_compile_markdown.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_compile_markdown.py b/tests/test_compile_markdown.py
index 4d0e3d89c..88ac290d0 100644
--- a/tests/test_compile_markdown.py
+++ b/tests/test_compile_markdown.py
@@ -31,8 +31,8 @@
<table class="codehilitetable"><tr><td class="linenos">\
<div class="linenodiv"><pre>1</pre></div>\
</td><td class="code"><pre class="code literal-block"><span></span>\
-<span class="kn">from</span> <span class="nn">this</span>
-</pre>
+<code><span class="kn">from</span> <span class="nn">this</span>
+</code></pre>
Comment on lines +19 to +22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's nothing nix specific here, probably should make a patch against upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already fixed in upstream (from version 8.1.0 onwards). So an option to prevent including this would be to upgrade to the latest version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another option is to use fetchpatch, here an example: https://github.com/NixOS/nixpkgs/pull/95524/files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seconded - change this to a fetchpatch of the relevant upstream commit (for a github commit you can usually just add .patch to the end of the url) and I'll review this.

</td></tr></table>
""",
id="hilite",