diff --git a/pylintrc b/pylintrc index d3bd531f02..c6964122c4 100644 --- a/pylintrc +++ b/pylintrc @@ -25,7 +25,7 @@ profile = no ignore = ,migrations persistent = yes -load-plugins = edx_lint.pylint +load-plugins = edx_lint.pylint,pylint_django [MESSAGES CONTROL] disable = @@ -97,6 +97,7 @@ ignore-imports = no ignore-mixin-members = yes ignored-classes = SQLObject zope = no +unsafe-load-any-extension = yes generated-members = REQUEST, acl_users, @@ -152,4 +153,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# 503c3db797ee662a18237a57f00cb1e6e553be34 +# d1176b1265180b3207835622b1d89b3087196517 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index bd0db987b3..846fc2d520 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -139,7 +139,6 @@ nose-ignore-docstring nosexcover==1.0.7 pep8==1.5.7 PyContracts==1.7.1 -pylint==1.4.4 python-subunit==0.0.16 pyquery==1.2.9 radon==1.2 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 478d1fb753..a22e434fea 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -51,7 +51,7 @@ git+https://github.com/edx/edx-oauth2-provider.git@0.5.7#egg=edx-oauth2-provider -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -e git+https://github.com/edx/edx-search.git@release-2015-09-11a#egg=edx-search git+https://github.com/edx/edx-milestones.git@release-2015-10-20#egg=edx-milestones==0.1.3 -git+https://github.com/edx/edx-lint.git@v0.3.0#egg=edx_lint==0.3.0 +git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive git+https://github.com/edx/edx-reverification-block.git@0.0.4#egg=edx-reverification-block==0.0.4 diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh index bcd0035719..7fb6ad6377 100755 --- a/scripts/all-tests.sh +++ b/scripts/all-tests.sh @@ -11,7 +11,7 @@ set -e ############################################################################### # Violations thresholds for failing the build -export PYLINT_THRESHOLD=5999 +export PYLINT_THRESHOLD=5650 export JSHINT_THRESHOLD=3700 doCheckVars() {