From c4036293b6a1ebeb2f537be57a82b45df9f7e157 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Sun, 25 Apr 2021 15:56:09 +0800
Subject: [PATCH 1/2] fix astroid to 2.4.2

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

diff --git a/setup.py b/setup.py
index da29c00d0..dd1247846 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@
     ],
     extras_require={
         ":python_version<'3.0'": ['pylint==1.9.2', 'futures'],
-        ":python_version>='3.0'": ['pylint==2.3.0']
+        ":python_version>='3.0'": ['pylint==2.3.0', 'astroid==2.4.2']   # pylint 2.3 doesn't support astroid 2.5
     },
     package_data={
         'azdev.config': ['*.*', 'cli_pylintrc', 'ext_pylintrc'],

From 90e344fd56f56c984375c6e7e53b06897d92746b Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Sun, 25 Apr 2021 16:07:30 +0800
Subject: [PATCH 2/2] Update setup.py

---
 setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index dd1247846..e7eb01f09 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,8 @@
         'jinja2',
         'knack',
         'mock',
+        'pylint==2.3.0',
+        'astroid==2.4.2',   # pylint 2.3 doesn't support astroid 2.5
         'pytest>=5.0.0',
         'pytest-xdist', # depends on pytest-forked
         'pyyaml',
@@ -77,10 +79,6 @@
         'azure-multiapi-storage',
         'isort==4.3.21'
     ],
-    extras_require={
-        ":python_version<'3.0'": ['pylint==1.9.2', 'futures'],
-        ":python_version>='3.0'": ['pylint==2.3.0', 'astroid==2.4.2']   # pylint 2.3 doesn't support astroid 2.5
-    },
     package_data={
         'azdev.config': ['*.*', 'cli_pylintrc', 'ext_pylintrc'],
         'azdev.mod_templates': ['*.*'],