Skip to content
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.

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

Python Requirements Update #114

Merged
merged 2 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion eventtracking/tracker.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def resolve_context(self):
Create a new dictionary that corresponds to the union of all of the
contexts that have been entered but not exited at this point.
"""
merged = dict()
merged = {}
for context in self.located_context.values():
merged.update(context)
return merged
Expand Down
10 changes: 6 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ amqp==2.6.1
# via
# -r requirements/test.txt
# kombu
astroid==2.6.6
astroid==2.7.2
# via
# -r requirements/test.txt
# pylint
Expand Down Expand Up @@ -147,7 +147,9 @@ pip-tools==6.2.0
# -r requirements/pip-tools.txt
platformdirs==2.2.0
# via
# -r requirements/test.txt
# -r requirements/travis.txt
# pylint
# virtualenv
pluggy==0.13.1
# via
Expand All @@ -167,7 +169,7 @@ pycodestyle==2.7.0
# -r requirements/test.txt
pygments==2.10.0
# via sphinx
pylint==2.9.6
pylint==2.10.2
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -247,7 +249,7 @@ sqlparse==0.4.1
# via
# -r requirements/test.txt
# django
stevedore==3.3.0
stevedore==3.4.0
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -267,7 +269,7 @@ tomli==1.2.1
# via
# -r requirements/pip-tools.txt
# pep517
tox==3.24.2
tox==3.24.3
# via
# -r requirements/dev.in
# -r requirements/travis.txt
Expand Down
8 changes: 5 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# via
# -r requirements/base.txt
# kombu
astroid==2.6.6
astroid==2.7.2
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -60,13 +60,15 @@ packaging==21.0
# via pytest
pbr==5.6.0
# via stevedore
platformdirs==2.2.0
# via pylint
pluggy==0.13.1
# via pytest
py==1.10.0
# via pytest
pycodestyle==2.7.0
# via -r requirements/test.in
pylint==2.9.6
pylint==2.10.2
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -106,7 +108,7 @@ sqlparse==0.4.1
# via
# -r requirements/base.txt
# django
stevedore==3.3.0
stevedore==3.4.0
# via code-annotations
text-unidecode==1.3
# via python-slugify
Expand Down
2 changes: 1 addition & 1 deletion requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ six==1.16.0
# virtualenv
toml==0.10.2
# via tox
tox==3.24.2
tox==3.24.3
# via
# -r requirements/travis.in
# tox-battery
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def load_requirements(*requirements_paths):
requirements = set()
for path in requirements_paths:
requirements.update(
line.strip() for line in open(path).readlines() # pylint: disable=consider-using-with
line.strip() for line in open(path, encoding="utf8").readlines() # pylint: disable=consider-using-with
Copy link
Member

Choose a reason for hiding this comment

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

pylint version 2.10.0 deprecated the use of open() without explicitly specifying any encoding. See pylint-dev/pylint#3826 for details.

if is_requirement(line)
)
return list(requirements)
Expand Down