From 5e41d9d158ffd1369b626b5b55207996468f6d17 Mon Sep 17 00:00:00 2001
From: David Garfinkle <david.garfinkle@shopify.com>
Date: Wed, 9 Dec 2020 12:06:11 -0500
Subject: [PATCH 1/5] Change pylint version constraint from ~=2.1.1 to ~=2.1

---
 setup.py                   | 2 +-
 shopify_python/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index c293a54..cda66dd 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def get_version():
     ],
     extras_require={
         ':python_version>="3.0"': [
-            'pylint~=2.1.1'
+            'pylint~=2.1'
         ],
         ':python_version<"3.0"': [
             'pylint~=1.9.3'
diff --git a/shopify_python/__init__.py b/shopify_python/__init__.py
index 0e73b16..175f13d 100644
--- a/shopify_python/__init__.py
+++ b/shopify_python/__init__.py
@@ -7,7 +7,7 @@
 from shopify_python import shopify_styleguide
 
 
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 
 
 def register(linter):  # type: (lint.PyLinter) -> None

From b23b0c1dd52e6cb04addf2729cbc0531fdebea8c Mon Sep 17 00:00:00 2001
From: David Garfinkle <david.garfinkle@shopify.com>
Date: Wed, 9 Dec 2020 12:30:01 -0500
Subject: [PATCH 2/5] Bump pylint to 2.6.0

---
 requirements.txt | 2 +-
 setup.py         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 14af4d4..53869d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@ pytest-randomly==1.1.2
 
 mock==2.0.0
 mypy==0.501  ; python_version >= "3.3"
-astroid>=1.6,<=2.0.4
+astroid~=1.6,<=2.0.4
diff --git a/setup.py b/setup.py
index cda66dd..ff71fb2 100755
--- a/setup.py
+++ b/setup.py
@@ -37,16 +37,16 @@ def get_version():
     ],
     test_suite='tests',
     install_requires=[
-        'GitPython~=2.1.11',
-        'typing~=3.6.6 ; python_version<"3.5"',
+        'GitPython~=2.1',
+        'typing~=3.6 ; python_version<"3.5"',
         'autopep8~=1.4',
     ],
     extras_require={
         ':python_version>="3.0"': [
-            'pylint~=2.1'
+            'pylint~=2.6'
         ],
         ':python_version<"3.0"': [
-            'pylint~=1.9.3'
+            'pylint~=1.9'
         ]
     }
 

From a844ab0ae600ff349e72765f08cd297a8a22ba04 Mon Sep 17 00:00:00 2001
From: David Garfinkle <david.garfinkle@shopify.com>
Date: Wed, 9 Dec 2020 16:19:32 -0500
Subject: [PATCH 3/5] Remove pylint bad-option-value deprecated-lambda which
 should not be used with pyver >= 3.0

---
 tests/functional/lambda_func.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/lambda_func.py b/tests/functional/lambda_func.py
index a73dab8..07c42f4 100644
--- a/tests/functional/lambda_func.py
+++ b/tests/functional/lambda_func.py
@@ -1,4 +1,4 @@
-# pylint: disable=missing-docstring,deprecated-lambda
+# pylint: disable=missing-docstring
 import operator as o
 import functools as f
 

From f34248db79850867a4abea46e09d571940157d9c Mon Sep 17 00:00:00 2001
From: David Garfinkle <david.garfinkle@shopify.com>
Date: Wed, 9 Dec 2020 16:46:05 -0500
Subject: [PATCH 4/5] remove pylint option old-style-class

---
 tests/functional/blank_line_after_class_required.py | 2 +-
 tests/functional/global_variable.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/blank_line_after_class_required.py b/tests/functional/blank_line_after_class_required.py
index ed25539..1384e31 100644
--- a/tests/functional/blank_line_after_class_required.py
+++ b/tests/functional/blank_line_after_class_required.py
@@ -1,4 +1,4 @@
-# pylint:disable=missing-docstring,invalid-name,too-few-public-methods,old-style-class
+# pylint:disable=missing-docstring,invalid-name,too-few-public-methods
 class SomeClass:  # [blank-line-after-class-required]
     def __init__(self):
         pass
diff --git a/tests/functional/global_variable.py b/tests/functional/global_variable.py
index fa200ec..deb0ebb 100644
--- a/tests/functional/global_variable.py
+++ b/tests/functional/global_variable.py
@@ -1,5 +1,5 @@
 # pylint: disable=invalid-name,too-few-public-methods,missing-docstring,unpacking-non-sequence,undefined-variable
-# pylint: disable=old-style-class
+# pylint:
 
 my_int = 77  # [global-variable]
 

From 2f879f6462b6284992c144c5713d43a36cd2d844 Mon Sep 17 00:00:00 2001
From: Eric Fung <eric.fung@shopify.com>
Date: Tue, 6 Apr 2021 11:39:34 -0400
Subject: [PATCH 5/5] Missing dependency needed by google style guide

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index ff71fb2..08b3eae 100755
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@ def get_version():
         'GitPython~=2.1',
         'typing~=3.6 ; python_version<"3.5"',
         'autopep8~=1.4',
+        'six'
     ],
     extras_require={
         ':python_version>="3.0"': [