From 43247c759c467fb301ac8e7f238be6336c66359d Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Wed, 17 Oct 2018 11:22:49 -0700
Subject: [PATCH 1/2] Update tools setup.

---
 tools/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/setup.py b/tools/setup.py
index 307d5b935c9..de692b28596 100644
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -23,7 +23,7 @@
 
 # Until https://gitlab.com/pycqa/flake8/issues/415 is resolved, pin version of pycodestyle
 DEPENDENCIES = [
-    'autopep8>=1.2.4',
+    'autopep8>=1.2.4,<1.4.1',
     'pylint==1.9.2',
     'coverage>=4.2',
     'flake8==3.5.0',

From 203a191106cbc85ca6ca5461c7547a6b6e2354df Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Wed, 17 Oct 2018 11:29:34 -0700
Subject: [PATCH 2/2] Remove autopep8

---
 Pipfile.lock                   |  6 ------
 tools/automation/style/pep8.py | 30 ------------------------------
 tools/setup.py                 |  1 -
 3 files changed, 37 deletions(-)
 delete mode 100644 tools/automation/style/pep8.py

diff --git a/Pipfile.lock b/Pipfile.lock
index 8b7703cbe62..32b8e21aeba 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1009,12 +1009,6 @@
             ],
             "version": "==1.6.5"
         },
-        "autopep8": {
-            "hashes": [
-                "sha256:2284d4ae2052fedb9f466c09728e30d2e231cfded5ffd7b1a20c34123fdc4ba4"
-            ],
-            "version": "==1.3.5"
-        },
         "azure-batch": {
             "hashes": [
                 "sha256:017be21a9e6db92473d2e33170d5dd445596fc70d706f73552ac9c6b57a6ef1c",
diff --git a/tools/automation/style/pep8.py b/tools/automation/style/pep8.py
deleted file mode 100644
index 6a5f20b3ad4..00000000000
--- a/tools/automation/style/pep8.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-import sys
-
-
-def fix_p2p8(directory):
-    import autopep8
-    import multiprocessing
-
-    # pylint: disable=protected-access
-    autopep8.fix_multiple_files([directory],
-                                options=autopep8._get_options(
-                                    {
-                                        'jobs': multiprocessing.cpu_count(),
-                                        'verbose': True,
-                                        'recursive': True,
-                                        'in_place': True,
-                                        'max_line_length': 100
-                                    }, False))
-
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        print('usage: python automation.style.pep8 <directory>')
-        sys.exit(1)
-
-    fix_p2p8(sys.argv[1])
diff --git a/tools/setup.py b/tools/setup.py
index de692b28596..e38286486c0 100644
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -23,7 +23,6 @@
 
 # Until https://gitlab.com/pycqa/flake8/issues/415 is resolved, pin version of pycodestyle
 DEPENDENCIES = [
-    'autopep8>=1.2.4,<1.4.1',
     'pylint==1.9.2',
     'coverage>=4.2',
     'flake8==3.5.0',