From dc627022d5b1145ffaf98c5d6e8dcb5c4fa02c6f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 Aug 2021 07:00:31 +0500 Subject: [PATCH 1/2] chore: Updating Python Requirements --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 12 +++++++----- requirements/doc.txt | 2 +- requirements/quality.txt | 8 +++++--- requirements/test.txt | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index cc3f6629..095784ab 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -23,5 +23,5 @@ pytz==2021.1 # via django sqlparse==0.4.1 # via django -stevedore==3.3.0 +stevedore==3.4.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 2d57672d..37399fe9 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -42,7 +42,7 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.24.1 +tox==3.24.3 # via # -r requirements/ci.in # tox-battery diff --git a/requirements/dev.txt b/requirements/dev.txt index 3daba61f..73b65388 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==2.6.6 +astroid==2.7.2 # via # -r requirements/quality.txt # pylint @@ -53,7 +53,7 @@ coverage==5.5 # pytest-cov ddt==1.4.2 # via -r requirements/quality.txt -diff-cover==6.3.1 +diff-cover==6.3.3 # via -r requirements/dev.in distlib==0.3.2 # via @@ -140,6 +140,8 @@ pip-tools==6.2.0 platformdirs==2.2.0 # via # -r requirements/ci.txt + # -r requirements/quality.txt + # pylint # virtualenv pluggy==0.13.1 # via @@ -164,7 +166,7 @@ pydocstyle==6.1.1 # via -r requirements/quality.txt pygments==2.10.0 # via diff-cover -pylint==2.9.6 +pylint==2.10.2 # via # -r requirements/quality.txt # edx-lint @@ -231,7 +233,7 @@ sqlparse==0.4.1 # via # -r requirements/quality.txt # django -stevedore==3.3.0 +stevedore==3.4.0 # via # -r requirements/quality.txt # code-annotations @@ -251,7 +253,7 @@ tomli==1.2.1 # via # -r requirements/pip-tools.txt # pep517 -tox==3.24.1 +tox==3.24.3 # via # -r requirements/ci.txt # tox-battery diff --git a/requirements/doc.txt b/requirements/doc.txt index 723d38b0..74f7b2ee 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -166,7 +166,7 @@ sqlparse==0.4.1 # via # -r requirements/test.txt # django -stevedore==3.3.0 +stevedore==3.4.0 # via # -r requirements/test.txt # doc8 diff --git a/requirements/quality.txt b/requirements/quality.txt index 4084823e..a80a9f80 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==2.6.6 +astroid==2.7.2 # via # pylint # pylint-celery @@ -67,6 +67,8 @@ pbr==5.6.0 # via # -r requirements/test.txt # stevedore +platformdirs==2.2.0 + # via pylint pluggy==0.13.1 # via # -r requirements/test.txt @@ -81,7 +83,7 @@ pycodestyle==2.7.0 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pylint==2.9.6 +pylint==2.10.2 # via # edx-lint # pylint-celery @@ -124,7 +126,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 diff --git a/requirements/test.txt b/requirements/test.txt index 40d21169..61eaf029 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -54,7 +54,7 @@ sqlparse==0.4.1 # via # -r requirements/base.txt # django -stevedore==3.3.0 +stevedore==3.4.0 # via -r requirements/base.txt toml==0.10.2 # via From 29fe97883e6b374597a0256e9f5b74a2b6364355 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Mon, 23 Aug 2021 12:06:27 +0500 Subject: [PATCH 2/2] fix: pass encoding parameter in open function --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index c560ab64..7b39c4b7 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ def get_version(*file_paths): Extract the version string from the file at the given relative path fragments. """ filename = os.path.join(os.path.dirname(__file__), *file_paths) - version_file = open(filename).read() + version_file = open(filename, encoding="utf8").read() version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M) if version_match: @@ -36,7 +36,7 @@ def load_requirements(*requirements_paths): requirements = set() for path in requirements_paths: requirements.update( - line.split('#')[0].strip() for line in open(path).readlines() + line.split('#')[0].strip() for line in open(path, encoding="utf8").readlines() if is_requirement(line.strip()) ) return list(requirements) @@ -67,8 +67,8 @@ def is_requirement(line): os.system("git push --tags") sys.exit() -README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read() -CHANGELOG = open(os.path.join(os.path.dirname(__file__), 'CHANGELOG.rst')).read() +README = open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding="utf8").read() +CHANGELOG = open(os.path.join(os.path.dirname(__file__), 'CHANGELOG.rst'), encoding="utf8").read() setup( name='edx-django-utils',