From 17750765007f95b670f67e26aedb1505a7d7732c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 21 Oct 2015 07:34:15 -0400 Subject: [PATCH] Update edx-lint to get updated pylintrc for Meta It's silly to have to shut up pylint for "class Meta" all the time. --- pylintrc | 4 ++-- requirements/edx/github.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pylintrc b/pylintrc index 5d39a610cb..d3bd531f02 100644 --- a/pylintrc +++ b/pylintrc @@ -73,7 +73,7 @@ class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ good-names = f,i,j,k,db,ex,Run,_,__ bad-names = foo,bar,baz,toto,tutu,tata -no-docstring-rgx = __.*__|test_.+|setUp|tearDown +no-docstring-rgx = __.*__$|test_.+|setUp$|setUpClass$|tearDown$|tearDownClass$|Meta$ docstring-min-length = -1 [FORMAT] @@ -152,4 +152,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# 6a610602e4c093047ed189c9a0d4ba796c7d1622 +# 503c3db797ee662a18237a57f00cb1e6e553be34 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 58861552e2..dd9f266fad 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -50,7 +50,7 @@ git+https://github.com/edx/edx-oauth2-provider.git@0.5.7#egg=oauth2-provider==0. -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-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.2.9#egg=edx_lint==0.2.9 +git+https://github.com/edx/edx-lint.git@v0.3.0#egg=edx_lint==0.3.0 -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