This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new af3a3766c Fix a couple small warnings
af3a3766c is described below
commit af3a3766c32901557c79c72f7b90dbe1dc7ba0af
Author: Dave Brondsema <[email protected]>
AuthorDate: Thu Jul 6 11:26:11 2023 -0400
Fix a couple small warnings
---
Allura/allura/scripts/trac_export.py | 2 +-
Allura/allura/templates/jinja_master/lib.html | 4 ++--
ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +-
pytest.ini | 5 ++++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Allura/allura/scripts/trac_export.py
b/Allura/allura/scripts/trac_export.py
index 86b5f569e..e40aa85f4 100644
--- a/Allura/allura/scripts/trac_export.py
+++ b/Allura/allura/scripts/trac_export.py
@@ -222,7 +222,7 @@ class TracExport:
if desc_el:
# TODO: Convert to Allura link syntax as needed
d['description'] = ''.join(
- desc_el.findAll(text=True)).strip()
+ desc_el.findAll(string=True)).strip()
list.append(d)
return list
diff --git a/Allura/allura/templates/jinja_master/lib.html
b/Allura/allura/templates/jinja_master/lib.html
index 598d7cf6d..97a2160f5 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -662,7 +662,7 @@ image.</p>
<p>Output:</p>
{{g.markdown.convert('''* this shows up in italics: *a happy day*
-* this shows the asterisks: \*a happy day\*''')}}
+* this shows the asterisks: \\*a happy day\\*''')}}
<p>The backslashes will disappear and leave the asterisks. You can do the
same with any of the
characters that have a special meaning<br>for Markdown.</p>
@@ -912,4 +912,4 @@ This page is based on some examples from Greg Schueler, <a
href="mailto:greg@var
{% if results_count and current_page < total_pages -%}
<link rel="next" href="{{ h.querystring(request,
dict(page=current_page,limit=None)) }}"/>
{% endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py
b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 7c6e4a0ca..24021ed40 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -107,7 +107,7 @@ class TestUIController(TestController):
'added', 'eee.txt',
'added', 'ggg.txt']
for i, item in enumerate(sortedCommits):
- assert actualCommit[i] == ''.join(item.findAll(text=True)).strip()
+ assert actualCommit[i] ==
''.join(item.findAll(string=True)).strip()
class TestRootController(_TestCase):
diff --git a/pytest.ini b/pytest.ini
index c689fada9..7d479aff1 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -20,8 +20,9 @@
# https://docs.python.org/3/using/cmdline.html#cmdoption-w
# https://docs.pytest.org/en/6.2.x/reference.html#ini-options-ref
filterwarnings =
+ # https://github.com/html5lib/html5lib-python/issues/443
ignore::DeprecationWarning:html5lib.filters.sanitizer
- # https://bizxinfo.atlassian.net/browse/SF-6067
+ # https://github.com/TurboGears/Ming/issues/48
ignore::DeprecationWarning:ming
# not sure why timermiddleware is surfacing pymongo warnings, but it does:
ignore:insert is deprecated. Use insert_one or insert_many
instead.:DeprecationWarning:timermiddleware
@@ -29,6 +30,8 @@ filterwarnings =
ignore:remove is deprecated. Use delete_one or delete_many
instead.:DeprecationWarning:timermiddleware
# other packages' issues:
ignore:Deprecated call to
`pkg_resources.declare_namespace:DeprecationWarning:pkg_resources
+ # https://github.com/pallets/jinja/issues/1156
+ error:invalid escape sequence::jinja2.lexer
addopts = --pyargs -p no:flaky --tb=short
