ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

pythonPackages.sphinx: 1.3.4 -> 1.3.6

Browse Source
This commit is contained in:
Graham Christensen 2016-04-01 11:48:18 -05:00 committed by Frederik Rietdijk
parent 2e9a1e263a
commit 65efc9ee2e
2 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
View File

@ -1,63 +0,0 @@
From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 18 Jan 2016 12:38:02 +0900
Subject: [PATCH] Fix tests are broken with pygments-2.1
---
tests/test_build_html.py | 2 +-
tests/test_intl.py | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index e330761..17ea089 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -82,7 +82,7 @@ def checker(nodes):
(".//a[@href='_downloads/img1.png']", ''),
(".//pre", u'"quotes"'),
(".//pre", u"'included'"),
- (".//pre/span[@class='s']", u'üöä'),
+ (".//pre/span[@class='s2']", u'üöä'),
(".//div[@class='inc-pyobj1 highlight-text']//pre",
r'^class Foo:\n pass\n\s*$'),
(".//div[@class='inc-pyobj2 highlight-text']//pre",
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 4c665d4..b24ec65 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning):
yield assert_count(expected_expr, result, 1)
# C code block with lang should not be translated but be *C* highlighted
- expected_expr = """<span class="cp">#include &lt;stdio.h&gt;</span>"""
+ expected_expr = ("""<span class="cp">#include</span> """
+ """<span class="cpf">&lt;stdio.h&gt;</span>""")
yield assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
expected_expr = (
"""<span class="gp">&gt;&gt;&gt; </span>"""
"""<span class="kn">import</span> <span class="nn">sys</span> """
- """<span class="c"># sys importing</span>""")
+ """<span class="c1"># sys importing</span>""")
yield assert_count(expected_expr, result, 1)
## raw.txt
@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning):
yield assert_count(expected_expr, result, 1)
# C code block with lang should be translated and be *C* highlighted
- expected_expr = """<span class="cp">#include &lt;STDIO.H&gt;</span>"""
+ expected_expr = ("""<span class="cp">#include</span> """
+ """<span class="cpf">&lt;STDIO.H&gt;</span>""")
yield assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
expected_expr = (
"""<span class="gp">&gt;&gt;&gt; </span>"""
"""<span class="kn">import</span> <span class="nn">sys</span> """
- """<span class="c"># SYS IMPORTING</span>""")
+ """<span class="c1"># SYS IMPORTING</span>""")
yield assert_count(expected_expr, result, 1)
## raw.txt

15
pkgs/top-level/python-packages.nix
View File

@ -785,7 +785,7 @@ in modules // {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn";
};
};
buildInputs = with self; [ zope_interface ];
};
@ -5386,7 +5386,7 @@ in modules // {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
};
};
propagatedBuildInputs = with self; [ greenlet ];
@ -12244,8 +12244,8 @@ in modules // {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
};
};
propagatedBuildInputs = with self; [ eventlib application gnutls ];
};
@ -20534,14 +20534,13 @@ in modules // {
sphinx = buildPythonPackage (rec {
name = "Sphinx-1.3.4";
name = "Sphinx-1.3.6";
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a";
sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb";
};
patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ];
LC_ALL = "en_US.UTF-8";
checkPhase = ''
PYTHON=${python.executable} make test
@ -20784,7 +20783,7 @@ in modules // {
src = pkgs.fetchFromGitHub {
repo = "sqlalchemy-imageattach";
owner = "crosspop";
owner = "crosspop";
rev = "${version}";
sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0";
};