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 2021/10/12 17:45:20 UTC
[allura] branch db/8397 created (now cd92c74)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch db/8397
in repository https://gitbox.apache.org/repos/asf/allura.git.
at cd92c74 [#8397] upgrade jinja2
This branch includes the following new commits:
new 5e5b012 [#8397] req.in should only pin important things; req.txt pins the current version
new 68f3ce5 [#8397] don't need to track specific versions & dependencies of dev requirements, make it simpler
new 660225d [#8397] upgrade Beaker
new 49d5539 [#8397] upgrade bleach and deps
new b1ad0bd [#8397] upgrade cryptography and deps
new 6f80e70 [#8397] upgrade docutils
new 747b95a [#8397] upgrade emoji
new 7df584c [#8397] upgrade feedgenerator and pytz
new 18c50e2 [#8397] upgrade formencode
new cd92c74 [#8397] upgrade jinja2
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[allura] 03/10: [#8397] upgrade Beaker
Posted by br...@apache.org.
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 660225d477e02cad9a39498a417e9d0eb3017f07
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 21:35:57 2021 +0000
[#8397] upgrade Beaker
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index a434e65..c181589 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@
#
activitystream==0.3.0
# via -r requirements.in
-beaker==1.10.1
+beaker==1.11.0
# via -r requirements.in
beautifulsoup4==4.10.0
# via
[allura] 08/10: [#8397] upgrade feedgenerator and pytz
Posted by br...@apache.org.
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 7df584c3785d179fa380307bc1b4f55d035c1a1e
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 22:09:26 2021 +0000
[#8397] upgrade feedgenerator and pytz
---
requirements.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 4f04e99..79fb34b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,7 +40,7 @@ easywidgets==0.3.6
# via -r requirements.in
emoji==1.5.0
# via -r requirements.in
-feedgenerator==1.9.1
+feedgenerator==2.0.0
# via -r requirements.in
feedparser==6.0.8
# via -r requirements.in
@@ -141,7 +141,7 @@ python-magic==0.4.24
# via -r requirements.in
python-oembed==0.2.4
# via -r requirements.in
-pytz==2019.1
+pytz==2021.3
# via
# -r requirements.in
# feedgenerator
@@ -167,7 +167,6 @@ six==1.16.0
# bleach
# creoleparser
# easywidgets
- # feedgenerator
# formencode
# html5lib
# ming
[allura] 09/10: [#8397] upgrade formencode
Posted by br...@apache.org.
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 18c50e2360f473ae9be936568854c03d79a89b17
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 22:12:13 2021 +0000
[#8397] upgrade formencode
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 79fb34b..a7d5b07 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,7 +44,7 @@ feedgenerator==2.0.0
# via -r requirements.in
feedparser==6.0.8
# via -r requirements.in
-formencode==2.0.0
+formencode==2.0.1
# via
# -r requirements.in
# easywidgets
[allura] 10/10: [#8397] upgrade jinja2
Posted by br...@apache.org.
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 cd92c74f1e3be9f1ca95910a81b3f419a780e75f
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Oct 8 17:58:35 2021 +0000
[#8397] upgrade jinja2
---
Allura/allura/lib/helpers.py | 5 +++--
requirements.txt | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index a7a334c..1ea1dd5 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -63,7 +63,8 @@ from tg.decorators import before_validate
from formencode.variabledecode import variable_decode
import formencode
from jinja2 import Markup
-from jinja2.filters import contextfilter, escape, do_filesizeformat
+from jinja2.filters import escape, do_filesizeformat
+from jinja2.utils import pass_context
from paste.deploy.converters import asbool, aslist, asint
from webhelpers2 import date, text
from webob.exc import HTTPUnauthorized
@@ -786,7 +787,7 @@ def render_any_markup(name, txt, code_mode=False, linenumbers_style=TABLE):
txt = '<pre>%s</pre>' % txt
return Markup(txt)
-@contextfilter
+@pass_context
def subrender_jinja_filter(context, value):
_template = context.eval_ctx.environment.from_string(value)
result = _template.render(**context)
diff --git a/requirements.txt b/requirements.txt
index a7d5b07..3116a27 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -71,7 +71,7 @@ inflection==0.5.1
# via profanityfilter
iso8601==0.1.16
# via colander
-jinja2==2.11.3
+jinja2==3.0.2
# via -r requirements.in
markdown==2.6.11
# via
[allura] 05/10: [#8397] upgrade cryptography and deps
Posted by br...@apache.org.
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 b1ad0bd415243e229cbcbe8a402b6f68e894ca6e
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 22:02:17 2021 +0000
[#8397] upgrade cryptography and deps
---
requirements.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 8388534..fb4d7b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ cchardet==2.1.7
# via -r requirements.in
certifi==2021.5.30
# via requests
-cffi==1.12.2
+cffi==1.14.6
# via cryptography
charset-normalizer==2.0.4
# via requests
@@ -28,7 +28,7 @@ crank==0.8.1
# via turbogears2
creoleparser==0.7.5
# via pypeline
-cryptography==3.3.2
+cryptography==35.0.0
# via -r requirements.in
datadiff==2.0.0
# via -r requirements.in
@@ -114,7 +114,7 @@ pillow==8.3.2
# via -r requirements.in
profanityfilter==2.0.6
# via -r requirements.in
-pycparser==2.19
+pycparser==2.20
# via cffi
pyflakes==2.1.1
# via -r requirements.in
@@ -166,7 +166,6 @@ six==1.16.0
# -r requirements.in
# bleach
# creoleparser
- # cryptography
# easywidgets
# feedgenerator
# formencode
[allura] 01/10: [#8397] req.in should only pin important things;
req.txt pins the current version
Posted by br...@apache.org.
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 5e5b012183f233068af8836f6f66c34e54d5c62f
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 21:46:52 2021 +0000
[#8397] req.in should only pin important things; req.txt pins the current version
---
requirements-dev.in | 8 ++++----
requirements-optional.txt | 2 +-
requirements.in | 24 ++++++++++++------------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/requirements-dev.in b/requirements-dev.in
index 04c57b0..c0ea97f 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -2,9 +2,9 @@
# nothing needed at runtime or for tests
pip-tools
-q==2.3
-sphinx-argparse==0.2.5
-sphinx-rtd-theme==0.1.6
-sphinxcontrib-programoutput==0.8
+q
+sphinx-argparse
+sphinx-rtd-theme
+sphinxcontrib-programoutput
coverage
nose
diff --git a/requirements-optional.txt b/requirements-optional.txt
index d3c4fb5..6b5ef0b 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -2,7 +2,7 @@
# License v2
# for ForgeWiki mediawiki importer, as well as ForgeBlog external feed
-html2text==2019.8.11 # last to support py2
+html2text
# for ForgeWiki's mediawiki importer:
mediawiki2html # GPL
diff --git a/requirements.in b/requirements.in
index 0627b83..798a1b8 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,54 +1,54 @@
-ActivityStream==0.3.0
+ActivityStream
beautifulsoup4
Beaker
cchardet
colander
cryptography
decorator
-EasyWidgets>=0.3.6
+EasyWidgets
emoji
feedgenerator
feedparser
-FormEncode>=2
+FormEncode
# 3.1.23 drops py36 support
GitPython<=3.1.23
html5lib
Jinja2
Markdown<3
-markdown-checklist==0.4.1
+markdown-checklist
MarkupSafe
-Ming==0.11.1
+Ming
# TODO: move to "oauthlib" instead
# oauth2 doesn't have a release with py3.6 support, but does have fixes on master:
# archive/.../.zip URL is preferable over git+https://... since it supports pip hash generating+checking
https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip#egg=oauth2
paginate
-Paste>=3.5
+Paste
PasteDeploy
PasteScript
Pillow
# profanity filter for feedback
-profanityfilter==2.0.6
+profanityfilter
Pygments
-pymongo==3.10.1
+pymongo
Pypeline[creole,markdown,textile,rst]
pysolr
python-dateutil
python-magic
python-oembed
-pytz==2019.1
+pytz
qrcode
requests
requests-oauthlib
# for taskd proc name switching
setproctitle
six
-TimerMiddleware==0.5.1
+TimerMiddleware
TurboGears2==2.3.12
WebHelpers2
-WebOb==1.7.4
+WebOb
werkzeug
-wrapt==1.11.2
+wrapt
# testing
datadiff
[allura] 06/10: [#8397] upgrade docutils
Posted by br...@apache.org.
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 6f80e7047494fbe7a1b5e6373f14a4ce8ba7d346
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 22:04:58 2021 +0000
[#8397] upgrade docutils
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index fb4d7b5..a8a9e96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,7 +34,7 @@ datadiff==2.0.0
# via -r requirements.in
decorator==5.1.0
# via -r requirements.in
-docutils==0.15.2
+docutils==0.17.1
# via pypeline
easywidgets==0.3.6
# via -r requirements.in
[allura] 07/10: [#8397] upgrade emoji
Posted by br...@apache.org.
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 <db...@slashdotmedia.com>
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
[allura] 04/10: [#8397] upgrade bleach and deps
Posted by br...@apache.org.
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 49d5539b3ee26ff83d91e9860ca847df60e9e2fd
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Thu Oct 7 21:47:45 2021 +0000
[#8397] upgrade bleach and deps
---
requirements.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index c181589..8388534 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ beautifulsoup4==4.10.0
# via
# -r requirements.in
# webtest
-bleach==3.3.0
+bleach==4.1.0
# via pypeline
cchardet==2.1.7
# via -r requirements.in
@@ -95,7 +95,7 @@ https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d926
# via -r requirements.in
oauthlib==3.0.2
# via requests-oauthlib
-packaging==20.9
+packaging==21.0
# via bleach
paginate==0.5.6
# via -r requirements.in
@@ -161,7 +161,7 @@ setproctitle==1.2.2
# via -r requirements.in
sgmllib3k==1.0.0
# via feedparser
-six==1.15.0
+six==1.16.0
# via
# -r requirements.in
# bleach
[allura] 02/10: [#8397] don't need to track specific versions &
dependencies of dev requirements, make it simpler
Posted by br...@apache.org.
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 68f3ce57e50cede05003c5ddb21a8666aaa5191c
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Tue Oct 12 17:44:25 2021 +0000
[#8397] don't need to track specific versions & dependencies of dev requirements, make it simpler
---
requirements-dev.in | 10 ------
requirements-dev.txt | 89 ++++++----------------------------------------------
2 files changed, 9 insertions(+), 90 deletions(-)
diff --git a/requirements-dev.in b/requirements-dev.in
deleted file mode 100644
index c0ea97f..0000000
--- a/requirements-dev.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# development-only dependencies
-# nothing needed at runtime or for tests
-
-pip-tools
-q
-sphinx-argparse
-sphinx-rtd-theme
-sphinxcontrib-programoutput
-coverage
-nose
diff --git a/requirements-dev.txt b/requirements-dev.txt
index b58798e..c0ea97f 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,81 +1,10 @@
-#
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
-#
-# pip-compile requirements-dev.in
-#
-alabaster==0.7.12
- # via sphinx
-babel==2.7.0
- # via sphinx
-certifi==2021.5.30
- # via requests
-charset-normalizer==2.0.4
- # via requests
-click==7.0
- # via pip-tools
-coverage==4.5.4
- # via -r requirements-dev.in
-docutils==0.15.2
- # via sphinx
-idna==3.2
- # via requests
-imagesize==1.1.0
- # via sphinx
-importlib-metadata==4.8.1
- # via pep517
-jinja2==2.11.3
- # via sphinx
-markupsafe==1.1.1
- # via jinja2
-nose==1.3.7
- # via -r requirements-dev.in
-packaging==20.9
- # via sphinx
-pep517==0.11.0
- # via pip-tools
-pip-tools==6.2.0
- # via -r requirements-dev.in
-pygments==2.9.0
- # via sphinx
-pyparsing==2.4.7
- # via packaging
-pytz==2019.1
- # via babel
-q==2.3
- # via -r requirements-dev.in
-requests==2.26.0
- # via sphinx
-six==1.15.0
- # via sphinx
-snowballstemmer==1.9.0
- # via sphinx
-sphinx==1.8.5
- # via
- # sphinx-argparse
- # sphinx-rtd-theme
- # sphinxcontrib-programoutput
-sphinx-argparse==0.2.5
- # via -r requirements-dev.in
-sphinx-rtd-theme==0.1.6
- # via -r requirements-dev.in
-sphinxcontrib-programoutput==0.8
- # via -r requirements-dev.in
-sphinxcontrib-websupport==1.1.2
- # via sphinx
-tomli==1.2.1
- # via pep517
-typing-extensions==3.10.0.2
- # via importlib-metadata
-urllib3==1.26.6
- # via requests
-wheel==0.37.0
- # via pip-tools
-zipp==3.5.0
- # via
- # importlib-metadata
- # pep517
+# development-only dependencies
+# nothing needed at runtime or for tests
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
+pip-tools
+q
+sphinx-argparse
+sphinx-rtd-theme
+sphinxcontrib-programoutput
+coverage
+nose