You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/09/21 14:54:13 UTC
[1/2] allura git commit: Upgrade to pygments 2.2 (includes faster
HTML rendering for long lines)
Repository: allura
Updated Branches:
refs/heads/master f26e1a7a1 -> ab020758f
Upgrade to pygments 2.2 (includes faster HTML rendering for long lines)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e851050d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e851050d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e851050d
Branch: refs/heads/master
Commit: e851050dbb1de878b1808075cc255439185d3697
Parents: f649254
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Sep 12 10:59:42 2017 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Sep 12 10:59:42 2017 -0400
----------------------------------------------------------------------
Allura/allura/tests/test_globals.py | 2 +-
Allura/allura/tests/test_helpers.py | 2 +-
ForgeGit/forgegit/tests/functional/test_controllers.py | 10 +++++-----
requirements.txt | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e851050d/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 28cd616..ec87f16 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -466,7 +466,7 @@ def test_markdown_autolink():
g.markdown.convert('a blahttp://sdf.com z'))
assert_in('literal <code>http://domain.net</code> literal',
g.markdown.convert('literal `http://domain.net` literal'))
- assert_in('<pre>preformatted http://domain.net\n</pre>',
+ assert_in('<pre><span></span>preformatted http://domain.net\n</pre>',
g.markdown.convert(' :::text\n'
' preformatted http://domain.net'))
http://git-wip-us.apache.org/repos/asf/allura/blob/e851050d/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index d2ca926..8435a12 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -253,7 +253,7 @@ def test_render_any_markup_formatting():
assert_equals(h.render_any_markup('README.md', '### foo\n'
' <script>alert(1)</script> bar'),
'<div class="markdown_content"><h3 id="foo">foo</h3>\n'
- '<div class="codehilite"><pre><span class="nt">'
+ '<div class="codehilite"><pre><span></span><span class="nt">'
'<script></span>alert(1)<span class="nt">'
'</script></span> bar\n</pre></div>\n\n</div>')
http://git-wip-us.apache.org/repos/asf/allura/blob/e851050d/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 0bcec92..ed6cd00 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -320,9 +320,9 @@ class TestRootController(_TestCase):
header = r.html.find('h2', {'class': 'dark title'}).contents[2]
assert 'index.html' in header, header
content = str(r.html.find('div', {'class': 'clip grid-19 codebrowser'}))
- assert ('<span class="nt"><h1></span>'
+ assert ('<span class="p"><</span><span class="nt">h1</span><span class="p">></span>'
'index.html'
- '<span class="nt"></h1></span>') in content, content
+ ) in content, content
# `index` dir in repo root
r = self.app.get(ci + 'tree/index/')
@@ -334,9 +334,9 @@ class TestRootController(_TestCase):
assert 'index' in header.contents[3], header.contents[3]
assert 'index.htm' in header.contents[4], header.contents[4]
content = str(r.html.find('div', {'class': 'clip grid-19 codebrowser'}))
- assert ('<span class="nt"><h1></span>'
+ assert ('<span class="p"><</span><span class="nt">h1</span><span class="p">></span>'
'index/index.htm'
- '<span class="nt"></h1></span>') in content, content
+ ) in content, content
def test_subscribe(self):
user = M.User.query.get(username='test-user')
@@ -760,7 +760,7 @@ class TestFork(_TestCase):
</li>
</ul>
<p>Diff:</p>
-<div class="codehilite"><pre><span class="gd">--- old</span>
+<div class="codehilite"><pre><span></span><span class="gd">--- old</span>
<span class="gi">+++ new</span>
<span class="gu">@@ -1 +1 @@</span>
<span class="gd">-description</span>
http://git-wip-us.apache.org/repos/asf/allura/blob/e851050d/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 44349fc..7eb11fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ PasteDeploy==1.5.0
PasteScript==1.7.4.2
Pillow==2.9.0
poster==0.8.1
-Pygments==2.0.2
+Pygments==2.2.0
pymongo==2.8.1
Pypeline==0.4
pysolr==3.6.0
[2/2] allura git commit: Merge commit
'e851050dbb1de878b1808075cc255439185d3697'
Posted by ke...@apache.org.
Merge commit 'e851050dbb1de878b1808075cc255439185d3697'
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ab020758
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ab020758
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ab020758
Branch: refs/heads/master
Commit: ab020758f2a05ce7ba5510f7c0b17ad09413587c
Parents: f26e1a7 e851050
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Thu Sep 21 13:59:45 2017 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Thu Sep 21 13:59:45 2017 +0000
----------------------------------------------------------------------
Allura/allura/tests/test_globals.py | 2 +-
Allura/allura/tests/test_helpers.py | 2 +-
ForgeGit/forgegit/tests/functional/test_controllers.py | 10 +++++-----
requirements.txt | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------