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 2020/06/18 15:42:01 UTC
[allura] branch db/8363 created (now e28d113)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch db/8363
in repository https://gitbox.apache.org/repos/asf/allura.git.
at e28d113 [#8363] no safe param in pymongo 3+
This branch includes the following new commits:
new b5b1953 [#8363] upgrade ming & pymongo
new a4d1b17 [#8363] in mim:// urls provide a host too
new 4f1b2f8 [#8363] misc api change
new e28d113 [#8363] no safe param in pymongo 3+
The 4 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/04: [#8363] misc api change
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8363
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 4f1b2f842876e56e6da2ad56c212ffb6eb0e7d1e
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue Jun 2 15:19:29 2020 -0400
[#8363] misc api change
---
Allura/allura/command/show_models.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index f38851d..b1bed1f 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -344,7 +344,7 @@ class EnsureIndexCommand(base.Command):
def _remove_dupes(self, collection, spec):
iname = collection.create_index(spec)
fields = [f[0] for f in spec]
- q = collection.find({}, fields=fields).sort(spec)
+ q = collection.find({}, projection=fields).sort(spec)
def keyfunc(doc):
return tuple(doc.get(f, None) for f in fields)
[allura] 01/04: [#8363] upgrade ming & pymongo
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8363
in repository https://gitbox.apache.org/repos/asf/allura.git
commit b5b1953b8f7e3bafeac24629b307433ca9521818
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Thu Jun 18 11:30:39 2020 -0400
[#8363] upgrade ming & pymongo
---
requirements.in | 4 ++--
requirements.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/requirements.in b/requirements.in
index 10f85c7..6f2e47b 100644
--- a/requirements.in
+++ b/requirements.in
@@ -19,7 +19,7 @@ Jinja2
Markdown<3
markdown-checklist==0.4.1
MarkupSafe
-Ming==0.5.7
+Ming==0.10.1
# oauth2 doesn't have py3.6 support. There's a fork with fixes but no pypi releases I can find. https://github.com/joestump/python-oauth2/issues/223
oauth2
paginate
@@ -30,7 +30,7 @@ Pillow
# profanity filter for feedback
profanityfilter==2.0.6
Pygments
-pymongo==2.8.1
+pymongo==3.10.1
Pypeline[creole,markdown,textile,rst]
pysolr==3.6.0
python-dateutil
diff --git a/requirements.txt b/requirements.txt
index 4030d32..955babb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@ enum34==1.1.6 # via colander, cryptography, traitlets
faulthandler==3.1 ; python_version < "3.3" # via -r requirements.in
feedgenerator==1.9.1 # via -r requirements.in
feedparser==5.2.1 # via -r requirements.in
-formencode==1.3.1 # via -r requirements.in, easywidgets, ming
+formencode==1.3.1 # via -r requirements.in, easywidgets
funcsigs==1.0.2 # via beaker, mock
future==0.17.1 # via timermiddleware
genshi==0.7.3 # via creoleparser
@@ -47,7 +47,7 @@ jinja2==2.11.2 # via -r requirements.in
markdown-checklist==0.4.1 # via -r requirements.in
markdown==2.6.11 # via -r requirements.in, markdown-checklist, pypeline
markupsafe==1.1.1 # via -r requirements.in, easywidgets, jinja2, turbogears2, webhelpers2
-ming==0.5.7 # via -r requirements.in
+ming==0.10.1 # via -r requirements.in
mock==3.0.5 # via -r requirements.in
nose==1.3.7 # via -r requirements.in
oauth2==1.9.0.post1 # via -r requirements.in
@@ -66,7 +66,7 @@ ptyprocess==0.6.0 # via pexpect
pycparser==2.19 # via cffi
pyflakes==2.1.1 # via -r requirements.in
pygments==2.4.2 # via -r requirements.in, ipython
-pymongo==2.8.1 # via -r requirements.in, activitystream, ming
+pymongo==3.10.1 # via -r requirements.in, activitystream, ming
pypeline[creole,markdown,rst,textile]==0.5.2 # via -r requirements.in
pysolr==3.6.0 # via -r requirements.in
python-dateutil==2.8.0 # via -r requirements.in, easywidgets
[allura] 04/04: [#8363] no safe param in pymongo 3+
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8363
in repository https://gitbox.apache.org/repos/asf/allura.git
commit e28d113c2d2628821486c8ee3672db1bc6128b04
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue Jun 2 15:19:50 2020 -0400
[#8363] no safe param in pymongo 3+
---
Allura/allura/model/repo_refresh.py | 8 ++++----
ForgeGit/forgegit/model/git_repo.py | 4 ++--
ForgeSVN/forgesvn/model/svn.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index c5a1824..8eb6b32 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -157,10 +157,10 @@ def refresh_commit_repos(all_commit_ids, repo):
app_config_id=repo.app.config._id,
link=oid,
url=repo.url_for_commit(oid)))
- ci.m.save(safe=False, validate=False)
- ref.m.save(safe=False, validate=False)
- link0.m.save(safe=False, validate=False)
- link1.m.save(safe=False, validate=False)
+ ci.m.save(validate=False)
+ ref.m.save(validate=False)
+ link0.m.save(validate=False)
+ link1.m.save(validate=False)
def refresh_children(ci):
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index c940d04..d0982b8 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -299,7 +299,7 @@ class GitImplementation(M.RepositoryImplementation):
else:
ci_doc = CommitDoc(dict(args, _id=ci.hexsha))
try:
- ci_doc.m.insert(safe=True)
+ ci_doc.m.insert()
except DuplicateKeyError:
if lazy:
return False
@@ -330,7 +330,7 @@ class GitImplementation(M.RepositoryImplementation):
else:
obj.type = o.type
doc.other_ids.append(obj)
- doc.m.save(safe=False)
+ doc.m.save()
return doc
def log(self, revs=None, path=None, exclude=None, id_only=True, limit=None, **kw):
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 76ed47a..7a95b83 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -392,7 +392,7 @@ class SVNImplementation(M.RepositoryImplementation):
else:
ci_doc = CommitDoc(dict(args, _id=oid))
try:
- ci_doc.m.insert(safe=True)
+ ci_doc.m.insert()
except DuplicateKeyError:
if lazy:
return False
[allura] 02/04: [#8363] in mim:// urls provide a host too
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8363
in repository https://gitbox.apache.org/repos/asf/allura.git
commit a4d1b1774c8f254b145041f947db71a575d1b9e8
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Jun 1 12:35:07 2020 -0400
[#8363] in mim:// urls provide a host too
---
Allura/allura/tests/model/test_filesystem.py | 4 ++--
Allura/allura/tests/test_multifactor.py | 4 ++--
Allura/allura/tests/test_utils.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Allura/allura/tests/model/test_filesystem.py b/Allura/allura/tests/model/test_filesystem.py
index bdf84e4..c360896 100644
--- a/Allura/allura/tests/model/test_filesystem.py
+++ b/Allura/allura/tests/model/test_filesystem.py
@@ -46,8 +46,8 @@ class TestFile(TestCase):
def setUp(self):
config = {
- 'ming.main.uri': 'mim://allura',
- 'ming.project.uri': 'mim://project-data',
+ 'ming.main.uri': 'mim://host/allura',
+ 'ming.project.uri': 'mim://host/project-data',
}
ming.configure(**config)
setup_unit_test()
diff --git a/Allura/allura/tests/test_multifactor.py b/Allura/allura/tests/test_multifactor.py
index e5e7834..3105a1f 100644
--- a/Allura/allura/tests/test_multifactor.py
+++ b/Allura/allura/tests/test_multifactor.py
@@ -180,7 +180,7 @@ class TestMongodbTotpService(TestAnyTotpServiceImplementation):
def setUp(self):
config = {
- 'ming.main.uri': 'mim://allura_test',
+ 'ming.main.uri': 'mim://host/allura_test',
}
ming.configure(**config)
@@ -306,7 +306,7 @@ class TestMongodbRecoveryCodeService(TestAnyRecoveryCodeServiceImplementation):
def setUp(self):
config = {
- 'ming.main.uri': 'mim://allura_test',
+ 'ming.main.uri': 'mim://host/allura_test',
}
ming.configure(**config)
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index 96273cb..24d324f 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -78,7 +78,7 @@ class TestChunkedIterator(unittest.TestCase):
def setUp(self):
setup_unit_test()
config = {
- 'ming.main.uri': 'mim://allura_test',
+ 'ming.main.uri': 'mim://host/allura_test',
}
ming.configure(**config)
for i in range(10):