From 63508adbcd7ce9d39e5249451b90b666216193c7 Mon Sep 17 00:00:00 2001 From: Feng Zhou Date: Sat, 21 Mar 2020 22:44:58 +0800 Subject: [PATCH] drop support for python 3.5 --- doc/command_guidelines.md | 2 +- doc/debug/debug_in_vs_code.md | 2 +- doc/extensions/authoring.md | 2 +- doc/install_linux_prerequisites.md | 22 ++++++++++---------- scripts/ci/build.sh | 3 --- src/azure-cli-command_modules-nspkg/setup.py | 3 --- src/azure-cli-core/setup.py | 1 - src/azure-cli-nspkg/setup.py | 1 - src/azure-cli-telemetry/setup.py | 1 - src/azure-cli-testsdk/setup.py | 1 - src/azure-cli/setup.py | 4 ---- tools/setup.py | 5 ----- 12 files changed, 14 insertions(+), 33 deletions(-) diff --git a/doc/command_guidelines.md b/doc/command_guidelines.md index e840ffa1274..825a5f8ca95 100644 --- a/doc/command_guidelines.md +++ b/doc/command_guidelines.md @@ -420,7 +420,7 @@ Virtual Network Rule Arguments ## Coding Practices -- All code must support Python 3.5, 3.6, 3.7 and 3.8 +- All code must support Python 3.6, 3.7 and 3.8 - PRs to Azure/azure-cli and Azure/azure-cli-extensions must pass CI - Code must pass style checks with pylint and pep8 - (*) All commands should have tests diff --git a/doc/debug/debug_in_vs_code.md b/doc/debug/debug_in_vs_code.md index 6f3b19ef4a2..534999cbd93 100644 --- a/doc/debug/debug_in_vs_code.md +++ b/doc/debug/debug_in_vs_code.md @@ -4,7 +4,7 @@ * Visual Studio Code [Link](http://code.visualstudio.com/) * Visual Studio Code Python Extension [Link](https://marketplace.visualstudio.com/items?itemName=donjayamanne.python) -* Python 3.5+ +* Python 3.6+ * Set up development environment [Link](https://github.com/Azure/azure-cli/blob/master/doc/configuring_your_machine.md) ## Quick start diff --git a/doc/extensions/authoring.md b/doc/extensions/authoring.md index 7ee63ca8f8a..54f25adfd91 100644 --- a/doc/extensions/authoring.md +++ b/doc/extensions/authoring.md @@ -121,7 +121,7 @@ See [Extension Metadata](metadata.md) for more information. ### Test your extension on Python 3 -- The CLI supports Python 3.5, 3.6, 3.7, 3.8 so verify that your extension does the same. +- The CLI supports Python 3.6, 3.7, 3.8 so verify that your extension does the same. - You can create virtual environments for different versions and run your extension in them. - e.g. `python3.6 -m venv env36` and `python3.8 -m venv env38`. diff --git a/doc/install_linux_prerequisites.md b/doc/install_linux_prerequisites.md index 46e3a65dccf..1842b7c5382 100644 --- a/doc/install_linux_prerequisites.md +++ b/doc/install_linux_prerequisites.md @@ -5,7 +5,7 @@ Some native Linux packages are required when installing the CLI with: - Interactive install script - ``pip`` -Current supported Python versions are Python 3.5, 3.6, 3.7, 3.8. Azure CLI packages prior to version 2.1.0 support both Python 2.7 and Python 3. +Current supported Python versions are Python 3.6, 3.7, 3.8. Azure CLI packages prior to version 2.1.0 support both Python 2.7 and Python 3. The commands to run to install the dependencies for some common distributions are listed below. @@ -28,19 +28,19 @@ The commands to run to install the dependencies for some common distributions ar * [CoreOS](#coreos-stable-899150--beta-101010--alpha-101010) ### Ubuntu 12.04 LTS -Python 2.7.3 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.3 should be already on the machine. Install Python 3.6+ if needed. ``` sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev ``` ### Ubuntu 14.04 LTS and BASH on Windows (Build 14362+) -Python 2.7.6 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.6 should be already on the machine. Install Python 3.6+ if needed. ``` sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev ``` ### Ubuntu 15.10 -Python 2.7.10 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.10 should be already on the machine. Install Python 3.6+ if needed. ``` sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev build-essential ``` @@ -56,39 +56,39 @@ sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev ``` ### Debian 7 -Python 2.7.3 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.3 should be already on the machine. Install Python 3.6+ if needed. ``` sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev ``` ### Debian 8 -Python 2.7.9 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.9 should be already on the machine. Install Python 3.6+ if needed. ``` sudo apt-get update && sudo apt-get install -y libssl-dev libffi-dev python-dev build-essential ``` ### CentOS 6.5 / 6.6 / 6.7 -Not supported with the default version of Python (2.6.6) on the machine. Install Python 3.5+ if needed. +Not supported with the default version of Python (2.6.6) on the machine. Install Python 3.6+ if needed. ### CentOS 7.1 / 7.2 -Python 2.7.5 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.5 should be already on the machine. Install Python 3.6+ if needed. ``` sudo yum check-update; sudo yum install -y gcc libffi-devel python-devel openssl-devel ``` ### RedHat RHEL 6.7 -Not supported with the default version of Python (2.6.6) on the machine. Install Python 3.5+ if needed. +Not supported with the default version of Python (2.6.6) on the machine. Install Python 3.6+ if needed. ### RedHat RHEL 7.2 -Python 2.7.5 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.5 should be already on the machine. Install Python 3.6+ if needed. ``` sudo yum check-update; sudo yum install -y gcc libffi-devel python-devel openssl-devel ``` ### SUSE OpenSUSE 13.2 -Python 2.7.8 should be already on the machine. Install Python 3.5+ if needed. +Python 2.7.8 should be already on the machine. Install Python 3.6+ if needed. ``` sudo zypper refresh && sudo zypper --non-interactive install gcc libffi-devel python-devel openssl-devel ``` diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index c4697c22850..9ca0d696ef7 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -92,10 +92,7 @@ CLASSIFIERS = [ 'Development Status :: 3 - Alpha', 'Intended Audience :: Developers', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli-command_modules-nspkg/setup.py b/src/azure-cli-command_modules-nspkg/setup.py index 7621cb7befa..2cfe3b6241f 100644 --- a/src/azure-cli-command_modules-nspkg/setup.py +++ b/src/azure-cli-command_modules-nspkg/setup.py @@ -15,10 +15,7 @@ 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index d2858a9627a..8a97d6c9e1e 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -43,7 +43,6 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli-nspkg/setup.py b/src/azure-cli-nspkg/setup.py index ef9dbb15b98..fb01c0b8d9f 100644 --- a/src/azure-cli-nspkg/setup.py +++ b/src/azure-cli-nspkg/setup.py @@ -16,7 +16,6 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli-telemetry/setup.py b/src/azure-cli-telemetry/setup.py index 6bca6ba87e8..de4aded426e 100755 --- a/src/azure-cli-telemetry/setup.py +++ b/src/azure-cli-telemetry/setup.py @@ -24,7 +24,6 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli-testsdk/setup.py b/src/azure-cli-testsdk/setup.py index 7b55c253259..080f6a2abe5 100644 --- a/src/azure-cli-testsdk/setup.py +++ b/src/azure-cli-testsdk/setup.py @@ -21,7 +21,6 @@ 'Intended Audience :: Developers', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 83fb1cf68de..52c17356f70 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -43,7 +43,6 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', @@ -154,9 +153,6 @@ with open('HISTORY.rst', 'r', encoding='utf-8') as f: HISTORY = f.read() -if sys.version_info < (3, 4): - raise ImportError("azure-cli requires Python 3.4 or later.") - setup( name='azure-cli', version=VERSION, diff --git a/tools/setup.py b/tools/setup.py index bf17797f9fc..85ac561c291 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -4,7 +4,6 @@ # -------------------------------------------------------------------------------------------- from setuptools import setup -import sys VERSION = "0.1.1" @@ -14,7 +13,6 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', @@ -36,9 +34,6 @@ 'colorama>=0.3.7' ] -if sys.version_info < (3, 4): - raise ImportError("azure-cli requires Python 3.4 or later.") - setup( name='azure-cli-dev-tools', version=VERSION,