Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Changed
function must be called separately. (improvement)
* Update various internal dependencies to latest stable versions (cryptography, jinja2, requests,
apscheduler, eventlet, amqp, kombu, semver, six) #4819 (improvement)
* Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement)

Fixed
~~~~~
Expand Down
2 changes: 1 addition & 1 deletion fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ requests[security]==2.22.0
apscheduler==3.6.3
gitpython==2.1.11
jsonschema==2.6.0
pymongo==3.7.2
pymongo==3.10.0
Copy link
Member

@arm4b arm4b Dec 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I remember requirements.txt needs to be re-generated too based on this file

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, need to add generated files, was waiting on tests to pass first :)

mongoengine==0.18.2
passlib==1.7.1
lockfile==0.12.2
Expand Down
3 changes: 3 additions & 0 deletions st2common/st2common/models/db/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@ def db_cleanup(db_name, db_host, db_port, username=None, password=None,

def _get_ssl_kwargs(ssl=False, ssl_keyfile=None, ssl_certfile=None, ssl_cert_reqs=None,
ssl_ca_certs=None, authentication_mechanism=None, ssl_match_hostname=True):
# NOTE: In pymongo 3.9.0 some of the ssl related arguments have been renamed -
# https://api.mongodb.com/python/current/changelog.html#changes-in-version-3-9-0
# Old names still work, but we should eventually update to new argument names.
ssl_kwargs = {
'ssl': ssl,
}
Expand Down