You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/04/15 19:45:58 UTC
[1/2] allura git commit: [#7855] Updated a test to work with Pygments
version 1.6 and higher
Repository: allura
Updated Branches:
refs/heads/master 89981f0ae -> a3f7d44ab
[#7855] Updated a test to work with Pygments version 1.6 and higher
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d731920a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d731920a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d731920a
Branch: refs/heads/master
Commit: d731920ab24ea35c21cf0f57ef4ed040612720e9
Parents: 89981f0
Author: Heith Seewald <hs...@slashdotmedia.com>
Authored: Tue Apr 14 19:16:25 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 15 16:36:13 2015 +0000
----------------------------------------------------------------------
Allura/allura/tests/test_utils.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d731920a/Allura/allura/tests/test_utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index 06579c5..7903ba3 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -25,7 +25,7 @@ from os import path
from webob import Request
from mock import Mock, patch
-from nose.tools import assert_equal, assert_raises
+from nose.tools import assert_equal, assert_raises, assert_in
from pygments import highlight
from pygments.lexers import get_lexer_for_filename
from tg import config
@@ -201,7 +201,7 @@ class TestLineAnchorCodeHtmlFormatter(unittest.TestCase):
hl_code = highlight(code, lexer, formatter)
assert '<div class="codehilite">' in hl_code
assert '<div id="l1" class="code_block">' in hl_code
- assert '<span class="lineno">1</span>' in hl_code
+ assert_in('<span class="lineno">1 </span>', hl_code)
class TestIsTextFile(unittest.TestCase):
[2/2] allura git commit: [#7855] update packages
Posted by br...@apache.org.
[#7855] update packages
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a3f7d44a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a3f7d44a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a3f7d44a
Branch: refs/heads/master
Commit: a3f7d44ab3ca05686c10a655ea8d8f6d2f392421
Parents: d731920
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Apr 15 17:45:30 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 15 17:45:30 2015 +0000
----------------------------------------------------------------------
requirements.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a3f7d44a/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 5664528..21b0ca5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ colander==0.9.3
Creoleparser==0.7.3
decorator==3.3.2
# dep of pypeline, sphinx
-docutils==0.9
+docutils==0.12
EasyWidgets==0.2dev-20130716
faulthandler==2.1
feedparser==5.1.3
@@ -29,9 +29,9 @@ PasteDeploy==1.5.0
PasteScript==1.7.4.2
Pillow==2.0.0
poster==0.8.1
-Pygments==1.6
+Pygments==2.0.2
pymongo==2.4.2
-Pypeline==0.1dev
+Pypeline==0.2
pysolr==2.1.0-beta
python-dateutil==1.5
python-magic==0.4.3
@@ -53,7 +53,7 @@ WebOb==1.0.8
wsgiref==0.1.2
# tg2 deps (not used directly)
-Babel==0.9.6
+Babel==1.3
Mako==0.3.2
MarkupSafe==0.15
Pylons==1.0