From 35f6822f92ade23e83d2da1a0b589de260abdb3e Mon Sep 17 00:00:00 2001
From: Troy Sankey <tsankey@edx.org>
Date: Thu, 21 Feb 2019 15:39:12 -0500
Subject: [PATCH] PII annotations can be longer than 120 characters now
PLAT-2424
---
lms/djangoapps/survey/models.py | 1 -
pylintrc | 4 ++--
requirements/edx/development.txt | 2 +-
requirements/edx/testing.in | 2 +-
requirements/edx/testing.txt | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lms/djangoapps/survey/models.py b/lms/djangoapps/survey/models.py
index 52b3bc69555..9ef3590737d 100644
--- a/lms/djangoapps/survey/models.py
+++ b/lms/djangoapps/survey/models.py
@@ -164,7 +164,6 @@ class SurveyForm(TimeStampedModel):
class SurveyAnswer(TimeStampedModel):
- # pylint: disable=line-too-long
"""
Model for the answers that a user gives for a particular form in a course
diff --git a/pylintrc b/pylintrc
index 725a0312969..717c2ce5742 100644
--- a/pylintrc
+++ b/pylintrc
@@ -373,7 +373,7 @@ docstring-min-length = 5
[FORMAT]
max-line-length = 120
-ignore-long-lines = ^\s*(# )?<?https?://\S+>?$
+ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. pii: .*))$
single-line-if-stmt = no
no-space-check = trailing-comma,dict-separator
max-module-lines = 1000
@@ -446,4 +446,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = Exception
-# ddfc2b6fc6acff4fdfcc76ecb982aa840035d86f
+# bb786547d45a1ec1adda9b687d900083dd57603b
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index c2496cd1984..9a7498cd049 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -137,7 +137,7 @@ edx-django-utils==1.0.3
edx-drf-extensions==2.0.1
edx-enterprise==1.2.12
edx-i18n-tools==0.4.8
-edx-lint==1.1.0
+edx-lint==1.1.1
edx-milestones==0.1.13
edx-oauth2-provider==1.2.2
edx-opaque-keys[django]==0.4.4
diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index d4ce3d011db..ed6dc834c05 100644
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -25,7 +25,7 @@ code-annotations # Perform code annotation checking, such as for PII an
cssselect # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery
ddt # Run a test case multiple times with different input; used in many, many of our tests
edx-i18n-tools>=0.4.6 # Commands for developers and translators to extract, compile and validate translations
-edx-lint==1.1.0 # pylint extensions for Open edX repositories
+edx-lint==1.1.1 # pylint extensions for Open edX repositories
factory_boy==2.8.1 # Library for creating test fixtures, used in many tests
freezegun # Allows tests to mock the output of assorted datetime module functions
httpretty # Library for mocking HTTP requests, used in many tests
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 9dfc1256181..1688d41ca7b 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -133,7 +133,7 @@ edx-django-utils==1.0.3
edx-drf-extensions==2.0.1
edx-enterprise==1.2.12
edx-i18n-tools==0.4.8
-edx-lint==1.1.0
+edx-lint==1.1.1
edx-milestones==0.1.13
edx-oauth2-provider==1.2.2
edx-opaque-keys[django]==0.4.4
--
GitLab