remove Python 2 and Python 3.5 support (Azure#176)

ankjayant · Mar 25, 2020 · 6529309 · 6529309
1 parent b365a9f
commit 6529309
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -21,14 +21,14 @@ The `azdev` tool is designed to aid new and experienced developers in contributi
 
 ## Setting up your development environment
 
-1. Install Python 3.5+ or 2.7+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7.
+1. Install Python 3.6+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7.
 2. Fork and clone the repository or repositories you wish to develop for.
     - For Azure CLI: https://github.com/Azure/azure-cli
     - For Azure CLI Extensions: https://github.com/Azure/azure-cli-extensions
     - Any other repository that you might have access to that contains CLI extensions.
 3. Create a new virtual environment for Python in the root of your clone. You can do this by running:
 
-    Python 3.5+ (all platforms):
+    Python 3.6+ (all platforms):
     ```BatchFile
     python -m venv env
     ```
@@ -37,11 +37,6 @@ The `azdev` tool is designed to aid new and experienced developers in contributi
     python3 -m venv env
     ```
 
-    Python 2.7+ (all platforms)
-    ```Shell
-    python -m virtualenv env
-    ```
-
 4. Activate the env virtual environment by running:
 
     Windows CMD.exe:

diff --git a/README.rst b/README.rst
@@ -6,7 +6,7 @@ The ``azdev`` tool is designed to aid new and experienced developers in contribu
 Setting up your development environment
 +++++++++++++++++++++++++++++++++++++++
 
-1. Install Python 3.5+ or 2.7+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7.
+1. Install Python 3.6+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7.
 
 2. Fork and clone the repository or repositories you wish to develop for.
     - For Azure CLI: https://github.com/Azure/azure-cli
@@ -15,7 +15,7 @@ Setting up your development environment
 
 3. Create a new virtual environment for Python in the root of your clone. You can do this by running:
 
-    Python 3.5+ (all platforms):
+    Python 3.6+ (all platforms):
 
     ::
 
@@ -27,12 +27,6 @@ Setting up your development environment
 
         python3 -m venv env
 
-    Python 2.7+ (all platforms):
-
-    ::
-
-        python -m virtualenv env
-
 
 4. Activate the env virtual environment by running:
 

diff --git a/azdev/mod_templates/setup.py b/azdev/mod_templates/setup.py
@@ -25,12 +25,10 @@
     '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.4',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
     'License :: OSI Approved :: MIT License',
 ]
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,42 +6,6 @@ trigger:
     include:
     - '*'
 jobs:
-- job: Tox27
-  displayName: 'Tox: Python 2.7'
-  condition: succeeded()
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python 2.7'
-    inputs:
-      versionSpec: 2.7
-  - task: Bash@3
-    displayName: 'Run Tox'
-    env:
-      TOXENV: py27
-    inputs:
-      targetType: 'filePath'
-      filePath: scripts/ci/run_tox.sh
-
-- job: Tox35
-  displayName: 'Tox: Python 3.5'
-  condition: succeeded()
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: UsePythonVersion@0
-    displayName: 'Use Python 3.5'
-    inputs:
-      versionSpec: 3.5
-  - task: Bash@3
-    displayName: 'Run Tox'
-    env:
-      TOXENV: py35
-    inputs:
-      targetType: 'filePath'
-      filePath: scripts/ci/run_tox.sh
-
 - job: Tox36
   displayName: 'Tox: Python 3.6'
   condition: succeeded()

diff --git a/setup.py b/setup.py
@@ -40,14 +40,12 @@
         'Environment :: Console',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8'
     ],
     keywords='azure',
-    python_requires='>=2.7,!=3.4,!=3.3,!=3.2,!=3.1,!=3.0,<=3.9',
+    python_requires='>=3.6,<=3.9',
     packages=[
         'azdev',
         'azdev.config',

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 envlist =
-    py27
-    py35
     py36
     py37
+    py38
 
 [testenv]
 whitelist_externals =