From a7b5782e539541973060a5d9e8151126459e95f9 Mon Sep 17 00:00:00 2001 From: Myron Date: Wed, 8 Apr 2020 14:52:22 +0800 Subject: [PATCH 1/2] fix dependency --- src/azure-cli-core/setup.py | 2 -- src/azure-cli/setup.py | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 0f89a7cf3c9..3b7772641fd 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -102,8 +102,6 @@ ":python_version<'3.4'": ['enum34'], ":python_version<'2.7.9'": ['pyopenssl', 'ndg-httpsclient', 'pyasn1'], ':python_version<"3.0"': ['futures'], - ":python_version<'3.0'": ['antlr4-python2-runtime'], - ":python_version>='3.0'": ['antlr4-python3-runtime'], "test": TESTS_REQUIRE, }, tests_require=TESTS_REQUIRE, diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 7b3d3986bdf..a3cc434d1df 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -50,6 +50,7 @@ ] DEPENDENCIES = [ + 'antlr4-python3-runtime~=4.7.2', 'azure-batch~=9.0', 'azure-cli-command_modules-nspkg~=2.0', 'azure-cli-core=={}.*'.format(VERSION), @@ -169,6 +170,9 @@ ], packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), install_requires=DEPENDENCIES, + extras_require={ + ":python_version<'3.0'": ['antlr4-python2-runtime'] + }, package_data={ 'azure.cli.core': ['auth_landing_pages/*.html'], 'azure.cli.command_modules.acr': ['*.json'], From 310b4dad9e57ea2a171a9a03378725ff5349b303 Mon Sep 17 00:00:00 2001 From: MyronFanQiu <49134743+MyronFanQiu@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:00:33 +0800 Subject: [PATCH 2/2] drop python2 support --- src/azure-cli/setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index a3cc434d1df..8aab5c22f9f 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -170,9 +170,6 @@ ], packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), install_requires=DEPENDENCIES, - extras_require={ - ":python_version<'3.0'": ['antlr4-python2-runtime'] - }, package_data={ 'azure.cli.core': ['auth_landing_pages/*.html'], 'azure.cli.command_modules.acr': ['*.json'],