Skip to content

Update pymongo to the latest version #4835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kami merged 5 commits into from
Dec 16, 2019
Merged

Update pymongo to the latest version #4835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ded84fc
Update pymongo to the latest version.
Kami Dec 16, 2019
c75f264
Add a comment.
Kami Dec 16, 2019
004db83
Add changelog entry.
Kami Dec 16, 2019
55b8138
Merge branch 'master' of github.com:StackStorm/st2 into update_pymongo
Kami Dec 16, 2019
30f5c3d
Re-generate requirements.txt files.
Kami Dec 16, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Changed
set to 3 seconds. Previously a default value of 30 seconds was used which means that for many
connection related errors, our code would first wait for this timeout to be reached (30 seconds)
before returning error to the end user. #4834
* Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement)

Fixed
~~~~~
Expand Down
2 changes: 1 addition & 1 deletion fixed-requirements.txt
View file
Open in desktop
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 •
edited
Loading

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

@Kami Kami Dec 16, 2019

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
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ prettytable
prompt-toolkit==1.0.15
psutil==5.6.3
pyinotify==0.9.6
pymongo==3.7.2
pymongo==3.10.0
pyrabbit
python-dateutil==2.8.0
python-editor==1.0.4
Expand Down
2 changes: 1 addition & 1 deletion st2api/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ kombu==4.6.6
mongoengine==0.18.2
oslo.config<1.13,>=1.12.1
oslo.utils<=3.37.0,>=3.36.2
pymongo==3.7.2
pymongo==3.10.0
six==1.13.0
2 changes: 1 addition & 1 deletion st2auth/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-
gunicorn==19.9.0
oslo.config<1.13,>=1.12.1
passlib==1.7.1
pymongo==3.7.2
pymongo==3.10.0
six==1.13.0
stevedore==1.30.1
2 changes: 1 addition & 1 deletion st2common/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mongoengine==0.18.2
networkx==1.11
oslo.config<1.13,>=1.12.1
paramiko==2.6.0
pymongo==3.7.2
pymongo==3.10.0
python-dateutil==2.8.0
python-statsd==2.1.0
pyyaml==5.1.2
Expand Down
3 changes: 3 additions & 0 deletions st2common/st2common/models/db/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,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
2 changes: 1 addition & 1 deletion st2stream/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ kombu==4.6.6
mongoengine==0.18.2
oslo.config<1.13,>=1.12.1
oslo.utils<=3.37.0,>=3.36.2
pymongo==3.7.2
pymongo==3.10.0
six==1.13.0