From 4b60f1339eecd54d77fd1080aecb4d21f969e84e Mon Sep 17 00:00:00 2001 From: stu Date: Tue, 31 Jan 2017 15:10:45 -0500 Subject: [PATCH 1/2] pin astroid version 1.3.8 for pylint dep --- requirements/edx/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1acd9de881..c4486ed790 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -150,6 +150,7 @@ django_debug_toolbar==1.5 sqlparse>=0.2.0,<0.3.0 # Used for testing +astroid==1.3.8 before_after==0.1.3 bok-choy==0.5.3 chrono==1.0.2 From 43329adeafad841321dcdee036818b4d66043631 Mon Sep 17 00:00:00 2001 From: stu Date: Tue, 31 Jan 2017 22:59:54 -0500 Subject: [PATCH 2/2] comment astroid dependency --- requirements/edx/base.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c4486ed790..9fa713fbcf 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -46,6 +46,9 @@ edx-ccx-keys==0.2.1 edx-drf-extensions==1.2.2 edx-i18n-tools==0.3.7 edx-lint==0.4.3 +# astroid 1.3.8 is an unmet dependency of the version of pylint used in edx-lint 0.4.3 +# when upgrading edx-lint, we should try to remove this from the platform +astroid==1.3.8 edx-django-oauth2-provider==1.1.4 edx-django-sites-extensions==2.1.1 edx-enterprise==0.19.1 @@ -150,7 +153,6 @@ django_debug_toolbar==1.5 sqlparse>=0.2.0,<0.3.0 # Used for testing -astroid==1.3.8 before_after==0.1.3 bok-choy==0.5.3 chrono==1.0.2