From b666e541961118614453168862a0e5c58445cd1c Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 10 Apr 2019 13:56:40 -0400
Subject: [PATCH 1/3] edx-lint --> 1.1.2

---
 requirements/edx/testing.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index ed6dc834c0..45aecbb6f7 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.1           # pylint extensions for Open edX repositories
+edx-lint==1.1.2           # 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

From e395efcb5dcebfa1901825948776cbe44e6ea00a Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 10 Apr 2019 15:44:16 -0400
Subject: [PATCH 2/3] make upgrade (except for python3-saml, which had problems
 at 1.6.0)

---
 requirements/edx/development.txt | 6 +++---
 requirements/edx/testing.txt     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 196ddb5b96..56e54409be 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -68,7 +68,7 @@ celery==3.1.25
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
-click-log==0.1.8
+click-log==0.3.2
 click==7.0
 code-annotations==0.3.1
 colorama==0.4.1
@@ -136,7 +136,7 @@ edx-django-utils==1.0.3
 edx-drf-extensions==2.2.0
 edx-enterprise==1.4.1
 edx-i18n-tools==0.4.8
-edx-lint==1.1.1
+edx-lint==1.1.2
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
@@ -336,7 +336,7 @@ tox-battery==0.5.1
 tox==3.8.6
 traceback2==1.4.0
 transifex-client==0.13.6
-twisted==18.9.0
+twisted==19.2.0
 typing==3.6.6
 unicodecsv==0.14.1
 unidecode==1.0.23
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 499a44e429..88414221dc 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -47,7 +47,7 @@ appdirs==1.4.3
 argh==0.26.2
 argparse==1.4.0           # via caniusepython3, unittest2
 asn1crypto==0.24.0
-astroid==1.5.3            # via edx-lint, pylint, pylint-celery
+astroid==1.5.3            # via pylint, pylint-celery
 atomicwrites==1.3.0       # via pytest
 attrs==17.4.0
 automat==0.7.0            # via twisted
@@ -66,7 +66,7 @@ celery==3.1.25
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
-click-log==0.1.8          # via edx-lint
+click-log==0.3.2          # via edx-lint
 click==7.0
 code-annotations==0.3.1
 colorama==0.4.1           # via radon
@@ -132,7 +132,7 @@ edx-django-utils==1.0.3
 edx-drf-extensions==2.2.0
 edx-enterprise==1.4.1
 edx-i18n-tools==0.4.8
-edx-lint==1.1.1
+edx-lint==1.1.2
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
 edx-opaque-keys[django]==0.4.4
@@ -323,7 +323,7 @@ tox-battery==0.5.1
 tox==3.8.6
 traceback2==1.4.0         # via testtools, unittest2
 transifex-client==0.13.6
-twisted==18.9.0           # via scrapy
+twisted==19.2.0           # via scrapy
 typing==3.6.6             # via flake8
 unicodecsv==0.14.1
 unidecode==1.0.23         # via python-slugify

From cb14e6b78936d56308cec58297907a53843a4dfd Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 10 Apr 2019 15:46:50 -0400
Subject: [PATCH 3/3] edx_lint write pylintrc

---
 pylintrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pylintrc b/pylintrc
index 717c2ce574..1b2a44c341 100644
--- a/pylintrc
+++ b/pylintrc
@@ -373,7 +373,7 @@ docstring-min-length = 5
 
 [FORMAT]
 max-line-length = 120
-ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. pii: .*))$
+ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. \w+: .*))$
 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
 
-# bb786547d45a1ec1adda9b687d900083dd57603b
+# e841c53729c149a4170b2a8b8315f7f410287777