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 2025/02/27 15:47:08 UTC
(allura) branch master updated (b0f98d300 -> d02c406fc)
This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
from b0f98d300 Use email authentication code for foreign logins without MFA
new 6553767dc be explicit about our need for cgi.FieldStorage as long as webob is giving us them
new d02c406fc Use "uv" to generate a universal req.txt for 3.9+
The 2 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.
Summary of changes:
Allura/allura/model/discuss.py | 5 +++--
requirements-dev.txt | 2 +-
requirements.in | 2 ++
requirements.txt | 32 ++++++++++++++++++--------------
4 files changed, 24 insertions(+), 17 deletions(-)
(allura) 01/02: be explicit about our need for cgi.FieldStorage as long as webob is giving us them
Posted by 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 6553767dcd908c6898b175ff42cd16be71eda146
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Feb 21 16:47:57 2025 -0500
be explicit about our need for cgi.FieldStorage as long as webob is giving us them
---
Allura/allura/model/discuss.py | 5 +++--
requirements.in | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 35d07cc77..8fd99cfc7 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -17,6 +17,7 @@
from __future__ import annotations
import os
import logging
+from cgi import FieldStorage
from datetime import datetime
import typing
@@ -654,14 +655,14 @@ def subject(self):
subject = getattr(artifact, 'email_subject', '')
return subject or '(no subject)'
- def add_multiple_attachments(self, file_info):
+ def add_multiple_attachments(self, file_info: FieldStorage | list[FieldStorage]):
if isinstance(file_info, list):
for fi in file_info:
self.add_attachment(fi)
else:
self.add_attachment(file_info)
- def add_attachment(self, file_info):
+ def add_attachment(self, file_info: FieldStorage): # webob provides attachments as FieldStorage via legacy-cgi
if hasattr(file_info, 'file'):
mime_type = file_info.type
if not mime_type or '/' not in mime_type:
diff --git a/requirements.in b/requirements.in
index ebc66919b..0b48ae4be 100644
--- a/requirements.in
+++ b/requirements.in
@@ -15,6 +15,8 @@ FormEncode
GitPython
html5lib
Jinja2
+# Webob uses legacy-cgi and so our tests need it too for cgi.FieldStorage, maybe webob 2 will remove it? https://github.com/Pylons/webob/pull/466
+legacy-cgi ; python_full_version >= '3.13'
# for faster resp.html parsing in tests
lxml
Markdown
(allura) 02/02: Use "uv" to generate a universal req.txt for 3.9+
Posted by 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 d02c406fc0fa0590ccca951504ee518842e742cf
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Feb 21 17:32:58 2025 -0500
Use "uv" to generate a universal req.txt for 3.9+
---
requirements-dev.txt | 2 +-
requirements.txt | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index ec1568631..e42df2f51 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
# development-only dependencies
# nothing needed at runtime or for tests
-pip-tools
+uv
q
sphinx-argparse
sphinx-rtd-theme
diff --git a/requirements.txt b/requirements.txt
index 1be12d25b..bc72e6685 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,5 @@
-#
-# This file is autogenerated by pip-compile with Python 3.9
-# by the following command:
-#
-# pip-compile
-#
+# This file was autogenerated by uv via the following command:
+# uv pip compile requirements.in -o requirements.txt --no-emit-package setuptools -p 3.9 --universal
activitystream==0.5.0
# via -r requirements.in
aiosmtpd==1.4.6
@@ -24,7 +20,7 @@ beautifulsoup4==4.13.3
# via
# -r requirements.in
# webtest
-bleach[css]==6.2.0
+bleach==6.2.0
# via pypeline
boto3==1.35.37
# via pymongo-auth-aws
@@ -49,6 +45,10 @@ charset-normalizer==3.4.1
# via requests
colander==1.8.3
# via -r requirements.in
+colorama==0.4.6 ; sys_platform == 'win32'
+ # via
+ # pytest
+ # qrcode
crank==0.8.1
# via turbogears2
creoleparser==0.7.5
@@ -74,7 +74,7 @@ easywidgets==0.4.2
# via -r requirements.in
emoji==2.14.1
# via -r requirements.in
-exceptiongroup==1.2.2
+exceptiongroup==1.2.2 ; python_full_version < '3.11'
# via
# anyio
# pytest
@@ -117,7 +117,7 @@ idna==3.10
# anyio
# httpx
# requests
-importlib-metadata==8.6.1
+importlib-metadata==8.6.1 ; python_full_version < '3.10'
# via markdown
inflection==0.5.1
# via profanityfilter
@@ -133,6 +133,10 @@ jmespath==1.0.1
# botocore
joserfc==1.0.3
# via beaker-session-jwt
+legacy-cgi==2.6.2 ; python_full_version >= '3.13'
+ # via
+ # -r requirements.in
+ # webob
lxml==5.3.1
# via -r requirements.in
markdown==3.7
@@ -201,7 +205,7 @@ pycparser==2.22
# via cffi
pygments==2.19.1
# via -r requirements.in
-pymongo[encryption]==4.11.1
+pymongo==4.11.1
# via
# -r requirements.in
# activitystream
@@ -211,7 +215,7 @@ pymongo-auth-aws==1.3.0
# via pymongo
pymongocrypt==1.12.2
# via pymongo
-pypeline[creole,markdown,rst,textile]==0.7.0
+pypeline==0.7.0
# via -r requirements.in
pysolr==3.10.0
# via -r requirements.in
@@ -295,7 +299,7 @@ timermiddleware==0.6.3
# via -r requirements.in
tinycss2==1.1.1
# via bleach
-tomli==2.2.1
+tomli==2.2.1 ; python_full_version < '3.11'
# via pytest
translationstring==1.4
# via colander
@@ -333,8 +337,8 @@ werkzeug==3.1.3
# via -r requirements.in
wrapt==1.17.2
# via -r requirements.in
-zipp==3.21.0
+zipp==3.21.0 ; python_full_version < '3.10'
# via importlib-metadata
-# The following packages are considered to be unsafe in a requirements file:
+# The following packages were excluded from the output:
# setuptools