You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2022/04/14 17:47:19 UTC
[allura] branch dw/8426 updated (abe7dc109 -> 66c3ffe85)
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
discard abe7dc109 fixup! SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 6215f50f2 fixup! SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 8e09095a1 fixup! SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
discard 29abda80e SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
discard 3cf3e0c3f SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
discard 5c57db8d4 SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
discard 9a0aec7b0 SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
discard f13736bc6 SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its deps: future,webob
discard a292c0b1e SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
discard ea2e270b6 SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade, and its deps: regex
discard bb9f358a0 SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
discard e83ef6580 SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
discard 6aa863948 SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps: requests,certifi,charset-normalizer,idna,urllib3
discard 92aad2113 SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps: bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
discard 21e28a4f0 SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
discard 208689a03 SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
discard acc7f35a0 SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps: paste,setuptools,six,PasteDeploy,six
discard d56fb4e5b SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
discard 7c1abee80 SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps: importlib-metadata,typing-extensions,zipp
discard 80d077f57 SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps: gitdb,smmap,typing-extensions
discard 744463a39 SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its deps: pytz
discard 4bfe8387d SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
discard 97bba3e72 SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
discard 5baf65f33 SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps: cffi,pycparser
discard 966545386 SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps: iso8601,setuptools,translationstring
discard d2c0aed80 SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its deps: soupsieve
add 2a7c6047f [#8425] upgrade jinja to 3.1.1
new 600c19648 SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its deps: soupsieve
new adc2bbc2a SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps: iso8601,setuptools,translationstring
new eb43b8de7 SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps: cffi,pycparser
new c729ec28b SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
new a29031d57 SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
new 480af62bc SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its deps: pytz
new d207efb88 SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps: gitdb,smmap,typing-extensions
new ddd1e082f SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps: importlib-metadata,typing-extensions,zipp
new 1288055af SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
new 092e9f6bc SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps: paste,setuptools,six,PasteDeploy,six
new 6339ff7ec SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
new 2261754a4 SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
new 1039980ea SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps: bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
new 800b12b16 SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps: requests,certifi,charset-normalizer,idna,urllib3
new 2aa8b28c5 SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
new fe613cada SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
new 25555596a SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade, and its deps: regex
new 0e4ede5a7 SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
new 9bf8b037d SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its deps: future,webob
new fc08e08ad SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
new fdab7b596 SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
new a43963002 SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
new 66c3ffe85 SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (abe7dc109)
\
N -- N -- N refs/heads/dw/8426 (66c3ffe85)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 23 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/controllers/project.py | 5 +++--
Allura/allura/lib/app_globals.py | 2 +-
Allura/allura/lib/helpers.py | 2 +-
Allura/allura/lib/macro.py | 3 ++-
Allura/allura/lib/phone/nexmo.py | 3 ++-
Allura/allura/lib/search.py | 15 ++++++++-------
Allura/allura/lib/widgets/user_profile.py | 4 ++--
Allura/allura/model/discuss.py | 3 ++-
Allura/allura/tests/test_globals.py | 2 +-
Allura/allura/tests/test_helpers.py | 2 +-
ForgeTracker/forgetracker/model/ticket.py | 9 +++++----
requirements.txt | 4 ++--
12 files changed, 30 insertions(+), 24 deletions(-)
[allura] 05/23: SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit a29031d5774533f9cb38d26114330ed69d47eb3c
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:44:19 2022 +0000
SF-6801 Upgrade emoji 1.5.0 -> 1.7.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 777a1ed6b..6c1de1a23 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,7 @@ docutils==0.17.1
# via pypeline
easywidgets==0.3.7
# via -r requirements.in
-emoji==1.5.0
+emoji==1.7.0
# via -r requirements.in
feedgenerator==2.0.0
# via -r requirements.in
[allura] 06/23: SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its deps: pytz
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 480af62bcdb16f082a0c6e84dca3432f7019d6cc
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:44:52 2022 +0000
SF-6801 Upgrade feedgenerator 2.0.0 -> no upgrade, and its deps: pytz
feedgenerator 2.0.0 -> no upgrade
pytz 2021.3 -> 2022.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 6c1de1a23..f714201b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -143,7 +143,7 @@ python-magic==0.4.24
# via -r requirements.in
python-oembed==0.2.4
# via -r requirements.in
-pytz==2021.3
+pytz==2022.1
# via
# -r requirements.in
# feedgenerator
[allura] 10/23: SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps: paste,setuptools,six,PasteDeploy,six
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 092e9f6bcdc71d95df3d01a470d1764647ac7378
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:47:57 2022 +0000
SF-6801 Upgrade PasteScript 3.1.0 -> 3.2.1, and its deps: paste,setuptools,six,PasteDeploy,six
PasteScript 3.1.0 -> 3.2.1
paste 3.5.0 -> no upgrade
setuptools 44.0.0 -> skipped (OUTDATED! latest is: 62.0.0)
six 1.16.0 -> no upgrade
PasteDeploy 2.0.1 -> 2.1.1
six 1.16.0 -> no upgrade
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 52c932de4..759ea9e39 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -110,7 +110,7 @@ pastedeploy==2.1.1
# via
# -r requirements.in
# pastescript
-pastescript==3.1.0
+pastescript==3.2.1
# via -r requirements.in
pillow==9.0.1
# via -r requirements.in
[allura] 18/23: SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 0e4ede5a7ea4eb8d0bce964b192b69520f2a867f
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:59:58 2022 +0000
SF-6801 Upgrade requests-oauthlib 1.2.0 -> 1.3.1, and its deps: oauthlib,requests,certifi,charset-normalizer,idna,urllib3
requests-oauthlib 1.2.0 -> 1.3.1
oauthlib 3.0.2 -> 3.2.0
requests 2.26.0 -> 2.27.1
certifi 2021.5.30 -> 2021.10.8
charset-normalizer 2.0.4 -> 2.0.12
idna 3.2 -> 3.3
urllib3 1.26.6 -> 1.26.9
---
requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index bf73f9136..2f2df8cc4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -95,7 +95,7 @@ mock==3.0.5
# via -r requirements.in
https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip#egg=oauth2
# via -r requirements.in
-oauthlib==3.0.2
+oauthlib==3.2.0
# via requests-oauthlib
paginate==0.5.6
# via -r requirements.in
@@ -159,7 +159,7 @@ requests==2.27.1
# -r requirements.in
# pysolr
# requests-oauthlib
-requests-oauthlib==1.2.0
+requests-oauthlib==1.3.1
# via -r requirements.in
setproctitle==1.2.2
# via -r requirements.in
[allura] 02/23: SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps: iso8601,setuptools,translationstring
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit adc2bbc2aea0e2af2e7f972049bf9a0da6bb5291
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:36:12 2022 +0000
SF-6801 Upgrade colander 1.8.3 -> no upgrade, and its deps: iso8601,setuptools,translationstring
colander 1.8.3 -> no upgrade
iso8601 1.0.2 -> no upgrade
setuptools 44.0.0 -> skipped (OUTDATED! latest is: 62.0.0)
translationstring 1.4 -> no upgrade
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index a57adf542..c4a5f6932 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -71,7 +71,7 @@ importlib-metadata==4.8.3
# via markdown
inflection==0.5.1
# via profanityfilter
-iso8601==0.1.16
+iso8601==1.0.2
# via colander
jinja2==3.1.1
# via -r requirements.in
[allura] 07/23: SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps: gitdb,smmap,typing-extensions
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit d207efb88deeda683cca47b0c7a8d9a0f6a342f9
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:45:12 2022 +0000
SF-6801 Upgrade GitPython 3.1.18 -> 3.1.27, and its deps: gitdb,smmap,typing-extensions
GitPython 3.1.18 -> 3.1.27
gitdb 4.0.7 -> 4.0.9
smmap 4.0.0 -> 5.0.0
typing-extensions 3.10.0.2 -> 4.1.1
---
requirements.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index f714201b3..a311b2345 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,9 +52,9 @@ future==0.17.1
# via timermiddleware
genshi==0.7.3
# via creoleparser
-gitdb==4.0.7
+gitdb==4.0.9
# via gitpython
-gitpython==3.1.18
+gitpython==3.1.27
# via -r requirements.in
gunicorn==20.1.0
# via -r requirements.in
@@ -183,7 +183,7 @@ six==1.16.0
# qrcode
# textile
# webhelpers2
-smmap==4.0.0
+smmap==5.0.0
# via gitdb
soupsieve==2.3.2
# via beautifulsoup4
@@ -197,7 +197,7 @@ translationstring==1.4
# via colander
turbogears2==2.3.12
# via -r requirements.in
-typing-extensions==3.10.0.2
+typing-extensions==4.1.1
# via
# gitpython
# importlib-metadata
[allura] 16/23: SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit fe613cadafa402c6f7201a32b6500e6ca7a3aab8
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:55:26 2022 +0000
SF-6801 Upgrade qrcode 6.1 -> 7.3.1, and its deps: six
qrcode 6.1 -> 7.3.1
six 1.16.0 -> no upgrade
---
requirements.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 3636a4bb1..98e56af2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -144,7 +144,7 @@ pytz==2022.1
# -r requirements.in
# feedgenerator
# ming
-qrcode==6.1
+qrcode==7.3.1
# via -r requirements.in
regex==2022.3.2
# via
@@ -178,7 +178,6 @@ six==1.16.0
# paste
# pastescript
# python-dateutil
- # qrcode
# webhelpers2
smmap==5.0.0
# via gitdb
[allura] 19/23: SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its deps: future,webob
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 9bf8b037d4ec94ea5b59bf84df34b516ee001592
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 21:00:46 2022 +0000
SF-6801 Upgrade TimerMiddleware 0.5.2 -> no upgrade, and its deps: future,webob
TimerMiddleware 0.5.2 -> no upgrade
future 0.18.2 -> no upgrade
webob 1.7.4 -> no upgrade (OUTDATED! latest is: 1.8.7)
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 2f2df8cc4..a496d8d43 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -48,7 +48,7 @@ formencode==2.0.1
# via
# -r requirements.in
# easywidgets
-future==0.17.1
+future==0.18.2
# via timermiddleware
genshi==0.7.6
# via creoleparser
[allura] 17/23: SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade, and its deps: regex
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 25555596a80cd8f799dc497ca177398b28ddf9ce
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:56:00 2022 +0000
SF-6801 Upgrade regex-as-re-globally 0.0.2 -> no upgrade, and its deps: regex
regex-as-re-globally 0.0.2 -> no upgrade
regex 2022.3.2 -> 2022.3.15
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 98e56af2b..bf73f9136 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -146,7 +146,7 @@ pytz==2022.1
# ming
qrcode==7.3.1
# via -r requirements.in
-regex==2022.3.2
+regex==2022.3.15
# via
# regex-as-re-globally
# textile
[allura] 04/23: SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit c729ec28b4ea8cdcbff4a7945cfd8b049a6fc7ef
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:41:04 2022 +0000
SF-6801 Upgrade decorator 5.1.0 -> 5.1.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index eb728afe9..777a1ed6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ cryptography==36.0.2
# via -r requirements.in
datadiff==2.0.0
# via -r requirements.in
-decorator==5.1.0
+decorator==5.1.1
# via -r requirements.in
docutils==0.17.1
# via pypeline
[allura] 13/23: SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps: bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 1039980ea2c555ab7bec989232836f53305b7102
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:50:53 2022 +0000
SF-6801 Upgrade Pypeline 0.5.3 -> no upgrade, and its deps: bleach,packaging,pyparsing,six,webencodings,html5lib,six,webencodings,Creoleparser,Genshi,six,markdown,importlib-metadata,typing-extensions,zipp,textile,html5lib,six,webencodings,six,docutils
Pypeline 0.5.3 -> no upgrade
bleach 4.1.0 -> 5.0.0
packaging 21.0 -> 21.3
pyparsing 2.4.7 -> no upgrade (OUTDATED! latest is: 3.0.7)
six 1.16.0 -> no upgrade
webencodings 0.5.1 -> no upgrade
html5lib 1.1 -> no upgrade
six 1.16.0 -> no upgrade
webencodings 0.5.1 -> no upgrade
Creoleparser 0.7.5 -> no upgrade
Genshi 0.7.3 -> 0.7.6
six 1.16.0 -> no upgrade
markdown 3.3.6 -> no upgrade
importlib-metadata 4.10.1 -> 4.11.3
typing-extensions 3.10.0.2 -> 4.1.1
zipp 3.5.0 -> 3.8.0
textile 3.0.4 -> 4.0.2
html5lib 1.1 -> no upgrade
six 1.16.0 -> no upgrade
webencodings 0.5.1 -> no upgrade
six 1.16.0 -> no upgrade
docutils 0.17.1 -> 0.18.1
---
requirements.txt | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 2f10083b6..3f2129bed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ beautifulsoup4==4.11.0
# via
# -r requirements.in
# webtest
-bleach==4.1.0
+bleach==5.0.0
# via pypeline
cchardet==2.1.7
# via -r requirements.in
@@ -34,7 +34,7 @@ datadiff==2.0.0
# via -r requirements.in
decorator==5.1.1
# via -r requirements.in
-docutils==0.17.1
+docutils==0.18.1
# via pypeline
easywidgets==0.3.7
# via -r requirements.in
@@ -50,7 +50,7 @@ formencode==2.0.1
# easywidgets
future==0.17.1
# via timermiddleware
-genshi==0.7.3
+genshi==0.7.6
# via creoleparser
gitdb==4.0.9
# via gitpython
@@ -97,8 +97,7 @@ https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d926
# via -r requirements.in
oauthlib==3.0.2
# via requests-oauthlib
-packaging==21.0
- # via bleach
+packaging==21.3
paginate==0.5.6
# via -r requirements.in
paste==3.5.0
@@ -151,7 +150,9 @@ pytz==2022.1
qrcode==6.1
# via -r requirements.in
regex==2022.3.2
- # via regex-as-re-globally
+ # via
+ # regex-as-re-globally
+ # textile
regex-as-re-globally==0.0.2
# via -r requirements.in
repoze.lru==0.7
@@ -174,6 +175,7 @@ six==1.16.0
# creoleparser
# easywidgets
# formencode
+ # genshi
# html5lib
# ming
# mock
@@ -181,7 +183,6 @@ six==1.16.0
# pastescript
# python-dateutil
# qrcode
- # textile
# webhelpers2
smmap==5.0.0
# via gitdb
@@ -189,7 +190,7 @@ soupsieve==2.3.2
# via beautifulsoup4
testfixtures==6.10.0
# via -r requirements.in
-textile==3.0.4
+textile==4.0.2
# via pypeline
timermiddleware==0.5.2
# via -r requirements.in
[allura] 08/23: SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps: importlib-metadata,typing-extensions,zipp
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit ddd1e082f3f15b56f64137301981d6b0c726a945
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:46:00 2022 +0000
SF-6801 Upgrade markdown 3.3.6 -> no upgrade, and its deps: importlib-metadata,typing-extensions,zipp
markdown 3.3.6 -> no upgrade
importlib-metadata 4.10.1 -> 4.11.3
typing-extensions 3.10.0.2 -> 4.1.1
zipp 3.5.0 -> 3.8.0
---
requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index a311b2345..3db1b617b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -67,7 +67,7 @@ httplib2==0.19.0
# via oauth2
idna==3.2
# via requests
-importlib-metadata==4.8.3
+importlib-metadata==4.11.3
# via markdown
inflection==0.5.1
# via profanityfilter
@@ -224,7 +224,7 @@ werkzeug==2.0.2
# via -r requirements.in
wrapt==1.11.2
# via -r requirements.in
-zipp==3.6.0
+zipp==3.8.0
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
[allura] 03/23: SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps: cffi,pycparser
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit eb43b8de7abb290da946b7d53f21dce57072cfda
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:40:12 2022 +0000
SF-6801 Upgrade cryptography 35.0.0 -> 36.0.2, and its deps: cffi,pycparser
cryptography 35.0.0 -> 36.0.2
cffi 1.14.6 -> 1.15.0
pycparser 2.20 -> 2.21
---
requirements.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index c4a5f6932..eb728afe9 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.14.6
+cffi==1.15.0
# 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==35.0.0
+cryptography==36.0.2
# via -r requirements.in
datadiff==2.0.0
# via -r requirements.in
@@ -116,7 +116,7 @@ pillow==9.0.1
# via -r requirements.in
profanityfilter==2.0.6
# via -r requirements.in
-pycparser==2.20
+pycparser==2.21
# via cffi
pyflakes==2.4.0
# via -r requirements.in
[allura] 14/23: SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps: requests,certifi,charset-normalizer,idna,urllib3
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 800b12b16a34ef28957398044af769981af49aa0
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:52:10 2022 +0000
SF-6801 Upgrade pysolr 3.9.0 -> no upgrade, and its deps: requests,certifi,charset-normalizer,idna,urllib3
pysolr 3.9.0 -> no upgrade
requests 2.26.0 -> 2.27.1
certifi 2021.5.30 -> 2021.10.8
charset-normalizer 2.0.4 -> 2.0.12
idna 3.2 -> 3.3
urllib3 1.26.6 -> 1.26.9
---
requirements.txt | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 3f2129bed..3f7422872 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,11 +16,11 @@ bleach==5.0.0
# via pypeline
cchardet==2.1.7
# via -r requirements.in
-certifi==2021.5.30
+certifi==2021.10.8
# via requests
cffi==1.15.0
# via cryptography
-charset-normalizer==2.0.4
+charset-normalizer==2.0.12
# via requests
colander==1.8.3
# via -r requirements.in
@@ -65,7 +65,7 @@ html5lib==1.1
# textile
httplib2==0.19.0
# via oauth2
-idna==3.2
+idna==3.3
# via requests
importlib-metadata==4.11.3
# via markdown
@@ -97,7 +97,6 @@ https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d926
# via -r requirements.in
oauthlib==3.0.2
# via requests-oauthlib
-packaging==21.3
paginate==0.5.6
# via -r requirements.in
paste==3.5.0
@@ -127,9 +126,7 @@ pymongo==3.11.4
# activitystream
# ming
pyparsing==2.4.7
- # via
- # httplib2
- # packaging
+ # via httplib2
pypeline[creole,markdown,rst,textile]==0.5.3
# via -r requirements.in
pysolr==3.9.0
@@ -157,7 +154,7 @@ regex-as-re-globally==0.0.2
# via -r requirements.in
repoze.lru==0.7
# via turbogears2
-requests==2.26.0
+requests==2.27.1
# via
# -r requirements.in
# pysolr
@@ -175,7 +172,6 @@ six==1.16.0
# creoleparser
# easywidgets
# formencode
- # genshi
# html5lib
# ming
# mock
@@ -202,7 +198,7 @@ typing-extensions==4.1.1
# via
# gitpython
# importlib-metadata
-urllib3==1.26.6
+urllib3==1.26.9
# via requests
waitress==2.1.1
# via webtest
[allura] 01/23: SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its deps: soupsieve
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 600c1964840f5a7cd9678044e40ca4096073eb73
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 15:21:10 2022 +0000
SF-6801 Upgrade beautifulsoup4 4.10.0 -> 4.11.0, and its deps: soupsieve
beautifulsoup4 4.10.0 -> 4.11.0
soupsieve 2.2.1 -> 2.3.2
---
requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 24c1b5352..a57adf542 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ activitystream==0.3.0
# via -r requirements.in
beaker==1.11.0
# via -r requirements.in
-beautifulsoup4==4.10.0
+beautifulsoup4==4.11.0
# via
# -r requirements.in
# webtest
@@ -185,7 +185,7 @@ six==1.16.0
# webhelpers2
smmap==4.0.0
# via gitdb
-soupsieve==2.2.1
+soupsieve==2.3.2
# via beautifulsoup4
testfixtures==6.10.0
# via -r requirements.in
[allura] 11/23: SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 6339ff7ec7d09df790d0dc3e39e4423b5cd4a1e4
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:49:15 2022 +0000
SF-6801 Upgrade Pillow 9.0.1 -> 9.1.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 759ea9e39..391418c6e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -112,7 +112,7 @@ pastedeploy==2.1.1
# pastescript
pastescript==3.2.1
# via -r requirements.in
-pillow==9.0.1
+pillow==9.1.0
# via -r requirements.in
profanityfilter==2.0.6
# via -r requirements.in
[allura] 21/23: SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit fdab7b5966a6cbeeb360a6dd72a86d8d840e9949
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 21:20:19 2022 +0000
SF-6801 Upgrade wrapt 1.11.2 -> 1.14.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 646f37de5..306c75708 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -218,7 +218,7 @@ webtest==3.0.0
# via -r requirements.in
werkzeug==2.1.1
# via -r requirements.in
-wrapt==1.11.2
+wrapt==1.14.0
# via -r requirements.in
zipp==3.8.0
# via importlib-metadata
[allura] 23/23: SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 66c3ffe8505b6d875607c42a2e1f0fd0ac4000f7
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 21:21:03 2022 +0000
SF-6801 Upgrade testfixtures 6.10.0 -> 6.18.5
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index ad7c966ee..b713032a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -182,7 +182,7 @@ smmap==5.0.0
# via gitdb
soupsieve==2.3.2
# via beautifulsoup4
-testfixtures==6.10.0
+testfixtures==6.18.5
# via -r requirements.in
textile==4.0.2
# via pypeline
[allura] 09/23: SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 1288055af8684aeb50939a26ad865c0250b9a9b9
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:47:22 2022 +0000
SF-6801 Upgrade PasteDeploy 2.0.1 -> 2.1.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 3db1b617b..52c932de4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -106,7 +106,7 @@ paste==3.5.0
# -r requirements.in
# easywidgets
# pastescript
-pastedeploy==2.0.1
+pastedeploy==2.1.1
# via
# -r requirements.in
# pastescript
[allura] 20/23: SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit fc08e08ad6fc75d59cdf55b3dfd598c1168742f8
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 21:18:59 2022 +0000
SF-6801 Upgrade Werkzeug 2.0.2 -> 2.1.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index a496d8d43..646f37de5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -216,7 +216,7 @@ webob==1.7.4
# webtest
webtest==3.0.0
# via -r requirements.in
-werkzeug==2.0.2
+werkzeug==2.1.1
# via -r requirements.in
wrapt==1.11.2
# via -r requirements.in
[allura] 22/23: SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit a43963002bc50ff6c33d89f7d09f9a53c43a795c
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 21:20:35 2022 +0000
SF-6801 Upgrade mock 3.0.5 -> 4.0.3, and its deps: six
mock 3.0.5 -> 4.0.3
six 1.16.0 -> no upgrade
---
ForgeImporters/forgeimporters/github/tests/test_code.py | 4 +++-
ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +-
requirements.txt | 3 +--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ForgeImporters/forgeimporters/github/tests/test_code.py b/ForgeImporters/forgeimporters/github/tests/test_code.py
index 0530cd6c0..d86d16031 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_code.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_code.py
@@ -35,6 +35,9 @@ with_git = with_tool(test_project_with_repo, 'git', 'src', 'git')
class TestGitHubRepoImporter(TestCase):
+ def setUp(self):
+ setup_unit_test()
+
def _make_project(self, gh_proj_name=None):
project = Mock()
project.get_tool_data.side_effect = lambda *args: gh_proj_name
@@ -44,7 +47,6 @@ class TestGitHubRepoImporter(TestCase):
@patch('forgeimporters.github.code.g')
@patch('forgeimporters.github.code.GitHubProjectExtractor')
def test_import_tool_happy_path(self, ghpe, g, M):
- setup_unit_test()
ghpe.return_value.get_repo_url.return_value = 'http://remote/clone/url/'
p = self._make_project(gh_proj_name='myproject')
u = Mock(name='c.user')
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 607335462..8451b4341 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -703,7 +703,7 @@ class _TestWithRepo(_Test):
c.project.install_app('svn', 'test1')
h.set_context('test', 'test1', neighborhood='Projects')
self.repo = M.Repository(name='test1', tool='svn')
- self.repo._impl = mock.Mock(spec=M.RepositoryImplementation())
+ self.repo._impl = mock.Mock()
self.repo._impl.shorthand_for_commit = M.RepositoryImplementation.shorthand_for_commit
self.repo._impl.url_for_commit = (
lambda *a, **kw: M.RepositoryImplementation.url_for_commit(
diff --git a/requirements.txt b/requirements.txt
index 306c75708..ad7c966ee 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -91,7 +91,7 @@ markupsafe==2.0.1
# webhelpers2
ming==0.11.2
# via -r requirements.in
-mock==3.0.5
+mock==4.0.3
# via -r requirements.in
https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip#egg=oauth2
# via -r requirements.in
@@ -174,7 +174,6 @@ six==1.16.0
# formencode
# html5lib
# ming
- # mock
# paste
# pastescript
# python-dateutil
[allura] 12/23: SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 2261754a485a7dbf20427191964171d74e82121d
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:50:11 2022 +0000
SF-6801 Upgrade Pygments 2.8.1 -> 2.11.2
---
Allura/allura/lib/app_globals.py | 1 +
.../forgegit/tests/functional/test_controllers.py | 20 ++++++++++----------
requirements.txt | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 4a958b19d..2db67995a 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -439,6 +439,7 @@ class Globals:
return Markup('<em>Empty file</em>')
# Don't use line numbers for diff highlight's, as per [#1484]
if lexer == 'diff':
+ # FIXME: this?
formatter = pygments.formatters.HtmlFormatter(cssclass='codehilite', linenos=False)
else:
formatter = self.pygments_formatter
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 698478c87..be07cbd6f 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -337,11 +337,11 @@ class TestRootController(_TestCase):
resp = self.app.get(h.urlquote(ci + 'tree/привіт.txt') + '?diff=407950e8fba4dbc108ffbce0128ed1085c52cfd7')
diffhtml = str(resp.html.select_one('.diffbrowser'))
assert_in(textwrap.dedent('''\
- <span class="gd">--- a/привіт.txt</span>
- <span class="gi">+++ b/привіт.txt</span>
- <span class="gu">@@ -1 +1,2 @@</span>
- Привіт!
- <span class="gi">+Which means Hello!</span>'''),
+ <span class="gd">--- a/привіт.txt</span><span class="w"></span>
+ <span class="gi">+++ b/привіт.txt</span><span class="w"></span>
+ <span class="gu">@@ -1 +1,2 @@</span><span class="w"></span>
+ <span class="w"> </span>Привіт!<span class="w"></span>
+ <span class="gi">+Which means Hello!</span><span class="w"></span>'''),
diffhtml)
resp = self.app.get(h.urlquote(ci + 'tree/привіт.txt') + '?diff=407950e8fba4dbc108ffbce0128ed1085c52cfd7&diformat=sidebyside')
@@ -896,11 +896,11 @@ class TestFork(_TestCase):
</li>
</ul>
<p>Diff:</p>
-<div class="codehilite"><pre><span></span><code><span class="gd">--- old</span>
-<span class="gi">+++ new</span>
-<span class="gu">@@ -1 +1 @@</span>
-<span class="gd">-description</span>
-<span class="gi">+changed description</span>
+<div class="codehilite"><pre><span></span><code><span class="gd">--- old</span><span class="w"></span>
+<span class="gi">+++ new</span><span class="w"></span>
+<span class="gu">@@ -1 +1 @@</span><span class="w"></span>
+<span class="gd">-description</span><span class="w"></span>
+<span class="gi">+changed description</span><span class="w"></span>
</code></pre></div>
</div>
""".strip())
diff --git a/requirements.txt b/requirements.txt
index 391418c6e..2f10083b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -120,7 +120,7 @@ pycparser==2.21
# via cffi
pyflakes==2.4.0
# via -r requirements.in
-pygments==2.9.0
+pygments==2.11.2
# via -r requirements.in
pymongo==3.11.4
# via
[allura] 15/23: SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8426
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 2aa8b28c506c3067416c7ac93dbf0a7d089b712f
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Fri Apr 8 20:52:40 2022 +0000
SF-6801 Upgrade python-magic 0.4.24 -> 0.4.25
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 3f7422872..3636a4bb1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -135,7 +135,7 @@ python-dateutil==2.8.0
# via
# -r requirements.in
# easywidgets
-python-magic==0.4.24
+python-magic==0.4.25
# via -r requirements.in
python-oembed==0.2.4
# via -r requirements.in