Remove python 2.7 support (#978)

* Remove python 2.7 support * Help text fix for private repo import * Mac agent version update from 10.13 to 10.15 in all our pipelines * Fix pylint errors * style fix
Azure · Mar 31, 2020 · b8fd994 · b8fd994
1 parent b1fba1f
commit b8fd994
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 26 deletions.
diff --git a/.azure-pipelines/azure-pipelines-create-release.yml b/.azure-pipelines/azure-pipelines-create-release.yml
@@ -41,7 +41,7 @@ jobs:
 - job: 'Run_Test'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - template: templates/run-tests.yml

diff --git a/.azure-pipelines/azure-pipelines-merge.yml b/.azure-pipelines/azure-pipelines-merge.yml
@@ -73,8 +73,6 @@ jobs:
     vmImage: 'Ubuntu-16.04'
   strategy:
     matrix:
-      Python27:
-        python.version: '2.x'
       Python36:
         python.version: '3.6.x'
       Python37:
@@ -91,7 +89,7 @@ jobs:
 - job: 'Run_Test_Mac'
   dependsOn: ['Build_Publish_Azure_CLI_Test_SDK','Build_Publish_Azure_DevOps_CLI_Extension']
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - template: templates/run-tests.yml
@@ -101,7 +99,7 @@ jobs:
 - job: 'Run_Test_Mac_Azure_CLI_Released_Version'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - template: templates/run-tests.yml
@@ -112,7 +110,7 @@ jobs:
 - job: 'Code_Coverage'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -149,7 +147,7 @@ jobs:
 
 - job: 'Run_Style_Check'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -174,7 +172,7 @@ jobs:
 - job: 'Run_HelpText_Check'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -201,7 +199,7 @@ jobs:
 - job: 'Run_Test_From_Old_Release'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - script: git checkout release-0.17.0

diff --git a/.azure-pipelines/azure-pipelines-pr.yml b/.azure-pipelines/azure-pipelines-pr.yml
@@ -44,8 +44,6 @@ jobs:
     vmImage: 'Ubuntu-16.04'
   strategy:
     matrix:
-      Python27:
-        python.version: '2.x'
       Python36:
         python.version: '3.6.x'
       Python37:
@@ -62,7 +60,7 @@ jobs:
 - job: 'Run_Test_Mac'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - template: templates/run-tests.yml
@@ -72,7 +70,7 @@ jobs:
 - job: 'Run_Test_Mac_Azure_CLI_Released_Version'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - template: templates/run-tests.yml
@@ -98,7 +96,7 @@ jobs:
 - job: 'Code_Coverage'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -135,7 +133,7 @@ jobs:
 
 - job: 'Run_Style_Check'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -160,7 +158,7 @@ jobs:
 - job: 'Run_HelpText_Check'
   dependsOn: 'Build_Publish_Azure_CLI_Test_SDK'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - task: UsePythonVersion@0
@@ -187,7 +185,7 @@ jobs:
 - job: 'Run_Test_From_Old_Release'
   dependsOn : Build_Publish_Azure_CLI_Test_SDK
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
 
   steps:
   - script: git checkout release-0.17.0

diff --git a/azure-devops/azext_devops/dev/common/artifacttool_updater.py b/azure-devops/azext_devops/dev/common/artifacttool_updater.py
@@ -88,8 +88,9 @@ def _update_artifacttool(uri, release_id):
                 logger.debug("Trying to remove old release %s", item)
                 shutil.rmtree(path, ignore_errors=True)   # Failing cleanup is not fatal
 
-    with humanfriendly.Spinner(label="Downloading Universal Packages tooling ({})"
-                               .format(release_id), total=100, stream=sys.stderr) as spinner:
+    with humanfriendly.Spinner(  # pylint: disable=no-member
+            label="Downloading Universal Packages tooling ({})"
+            .format(release_id), total=100, stream=sys.stderr) as spinner:
         spinner.step()
         logger.debug("Downloading ArtifactTool from %s", uri)
 

diff --git a/azure-devops/azext_devops/dev/common/external_tool.py b/azure-devops/azext_devops/dev/common/external_tool.py
@@ -65,7 +65,8 @@ class ProgressReportingExternalToolInvoker(ExternalToolInvoker):
     _spinner = None
 
     def run(self, command_args, env, initial_progress_text, stderr_handler):
-        with humanfriendly.Spinner(label=initial_progress_text, total=100, stream=sys.stderr) as self._spinner:
+        with humanfriendly.Spinner(  # pylint: disable=no-member
+                label=initial_progress_text, total=100, stream=sys.stderr) as self._spinner:
             self._spinner.step()
             # Start the process, process stderr for progress reporting, check the process result
             self.start(command_args, env)

diff --git a/...-devops/azext_devops/dev/pipelines/pipeline_create_helpers/pipelines_resource_provider.py b/...-devops/azext_devops/dev/pipelines/pipeline_create_helpers/pipelines_resource_provider.py
@@ -159,7 +159,7 @@ def poll_connection_ready(organization, project, connection_id):
     colorama.init()
     import humanfriendly
     import time
-    with humanfriendly.Spinner(label="Checking resource readiness") as spinner:
+    with humanfriendly.Spinner(label="Checking resource readiness") as spinner:  # pylint: disable=no-member
         se_client = get_service_endpoint_client(organization)
         while True:
             spinner.step()

diff --git a/azure-devops/azext_devops/dev/repos/import_request.py b/azure-devops/azext_devops/dev/repos/import_request.py
@@ -22,7 +22,7 @@ def create_import_request(git_source_url, project=None, repository=None,
                           user_name=None,
                           git_service_endpoint_id=None,
                           organization=None, detect=None):
-    """Create a git import request (currently only supports import from public git source)
+    """Create a git import request
     :param repository: Name or ID of the repository to create the import request in.
     :type repository: str
     :param git_source_url: Url of the source git repository.

diff --git a/azure-devops/setup.py b/azure-devops/setup.py
@@ -36,8 +36,6 @@
     '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',

diff --git a/doc/dev_setup.md b/doc/dev_setup.md
@@ -2,7 +2,7 @@
 
 ## Install pre-reqs
 
-1. Install Python 2.7 or 3.5 or later from python.org, apt-get, or some other installer.
+1. Install Python 3.5 or later from python.org, apt-get, or some other installer.
 
 1. Install Virtual Python Environment (virtualenv):
 

diff --git a/doc/samples.md b/doc/samples.md
@@ -247,7 +247,7 @@ jobs:
 - job:
   displayName: 'macOS'
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.15'
   steps:
   - template: azure-pipelines-steps-mac.yml