[allura] 03/17: [#8325] upgrade pygments

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit b175b324edc3ff3a144504d8b1d14c182657a0e9
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue Aug 20 17:05:39 2019 -0400

    [#8325] upgrade pygments
---
 Allura/allura/tests/test_globals.py | 10 +++++-----
 requirements.in                     |  2 +-
 requirements.txt                    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 86944a1..e8787fb 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -772,11 +772,11 @@ class TestEmojis(unittest.TestCase):
 
     def test_markdown_emoji_in_code(self):
         output = g.markdown.convert('This will not become an emoji `:+1:`')
-        assert u'<p>This will not become an emoji <code>:+1:</code></p>' in output
-        output = g.markdown.convert(u'```html\n<p>:Curaçao:</p>\n```')
-        assert u':Curaçao:' in output
-        output = g.markdown.convert(u'~~~\n:Curaçao:\n~~~')
-        assert u':Curaçao:' in output
+        assert_in(u'<p>This will not become an emoji <code>:+1:</code></p>', output)
+        output = g.markdown.convert(u'```html\n<p>:camel:</p>\n```')
+        assert_in(u':camel:', output)
+        output = g.markdown.convert(u'~~~\n:camel:\n~~~')
+        assert_in(u'<span class="p">:</span><span class="n">camel</span><span class="p">:</span>', output)
 
     def test_markdown_commit_with_emojis(self):
         output = g.markdown_commit.convert('Thumbs up emoji :+1: wow!')
diff --git a/requirements.in b/requirements.in
index 7fd5d0d..f41fc7d 100644
--- a/requirements.in
+++ b/requirements.in
@@ -26,7 +26,7 @@ Paste==3.0.1
 PasteDeploy==1.5.2
 PasteScript==2.0.2
 Pillow==5.2.0
-Pygments==2.2.0
+Pygments
 pymongo==2.8.1
 Pypeline[creole,markdown,textile,rst]
 pysolr==3.6.0
diff --git a/requirements.txt b/requirements.txt
index 64acf43..e0dd9f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -70,7 +70,7 @@ prompt-toolkit==1.0.16    # via ipython
 ptyprocess==0.6.0         # via pexpect
 pycparser==2.19           # via cffi
 pyflakes==2.1.1
-pygments==2.2.0
+pygments==2.4.2
 pylint==1.9.5
 pymongo==2.8.1
 pypeline[creole,markdown,rst,textile]==0.5.1