This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch db/8397 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 747b95a26261a49307513b0f6a517228e10a44ce Author: Dave Brondsema <[email protected]> AuthorDate: Tue Oct 12 14:42:40 2021 +0000 [#8397] upgrade emoji --- Allura/allura/tests/test_globals.py | 20 +++++++++++--------- requirements.in | 3 ++- requirements.txt | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py index 52f1cf8..8a38cc7 100644 --- a/Allura/allura/tests/test_globals.py +++ b/Allura/allura/tests/test_globals.py @@ -812,20 +812,22 @@ class TestCachedMarkdown(unittest.TestCase): class TestEmojis(unittest.TestCase): def test_markdown_emoji_atomic(self): + output = g.markdown.convert(':smile:') + assert_in('<p>\U0001F604</p>', output) output = g.markdown.convert(':+1:') - assert '<p>\U0001F44D</p>' in output + assert_in('<p>\U0001F44D</p>', output) output = g.markdown.convert(':Bosnia_&_Herzegovina:') - assert '<p>\U0001F1E7\U0001F1E6</p>' in output - output = g.markdown.convert(':Åland_Islands:') # emoji code with non-asciii charactor - assert '<p>\U0001F1E6\U0001F1FD</p>' in output + assert_in('<p>\U0001F1E7\U0001F1E6</p>', output) + output = g.markdown.convert(':Åland_Islands:') # emoji code with non-ascii character + assert_in('<p>\U0001F1E6\U0001F1FD</p>', output) def test_markdown_emoji_with_text(self): output = g.markdown.convert('Thumbs up emoji :+1: wow!') - assert '<p>Thumbs up emoji \U0001F44D wow!</p>' in output + assert_in('<p>Thumbs up emoji \U0001F44D wow!</p>', output) output = g.markdown.convert('More emojis :+1::camel::three_o’clock: wow!') - assert '<p>More emojis \U0001F44D\U0001F42B\U0001F552 wow!</p>' in output + assert_in('<p>More emojis \U0001F44D\U0001F42B\U0001F552 wow!</p>', output) output = g.markdown.convert(':man_bouncing_ball_medium-light_skin_tone:emoji:+1:') - assert '<p>\U000026F9\U0001F3FC\U0000200D\U00002642\U0000FE0Femoji\U0001F44D</p>' in output + assert_in('<p>\U000026F9\U0001F3FC\U0000200D\U00002642\U0000FE0Femoji\U0001F44D</p>', output) def test_markdown_emoji_in_code(self): output = g.markdown.convert('This will not become an emoji `:+1:`') @@ -842,9 +844,9 @@ class TestEmojis(unittest.TestCase): def test_markdown_commit_with_emojis(self): output = g.markdown_commit.convert('Thumbs up emoji :+1: wow!') - assert 'Thumbs up emoji \U0001F44D wow!' in output + assert_in('Thumbs up emoji \U0001F44D wow!', output) output = g.markdown.convert('More emojis :+1::camel::three_o’clock: wow!') - assert 'More emojis \U0001F44D\U0001F42B\U0001F552 wow!' in output + assert_in('More emojis \U0001F44D\U0001F42B\U0001F552 wow!', output) class TestUserMentions(unittest.TestCase): diff --git a/requirements.in b/requirements.in index 798a1b8..0226d27 100644 --- a/requirements.in +++ b/requirements.in @@ -6,7 +6,8 @@ colander cryptography decorator EasyWidgets -emoji +# https://github.com/carpedm20/emoji/issues/191 +emoji!=1.6.0 feedgenerator feedparser FormEncode diff --git a/requirements.txt b/requirements.txt index a8a9e96..4f04e99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,7 @@ docutils==0.17.1 # via pypeline easywidgets==0.3.6 # via -r requirements.in -emoji==0.5.3 +emoji==1.5.0 # via -r requirements.in feedgenerator==1.9.1 # via -r requirements.in
