Skip to content

Commit

Permalink
Drop support for Python 2.7 (#11363)
Browse files Browse the repository at this point in the history
Co-authored-by: Jiashuo Li <[email protected]>
  • Loading branch information
rodrigc and jiasli authored Feb 12, 2020
1 parent 44ef7ba commit afe1a01
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 502 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,10 @@ jobs:
python: 3.6
env: TOXENV=py36
script: ./scripts/ci/unittest.sh
- stage: unittest
python: 2.7
env: TOXENV=py27
script: ./scripts/ci/unittest.sh
- stage: verify
script: ./scripts/ci/test_profile_integration.sh
env: PURPOSE='Integration for profiles'
python: 3.6
- stage: verify
script: ./scripts/ci/test_profile_integration.sh
env: PURPOSE='Integration for profiles'
python: 2.7
- stage: verify
script: ./scripts/ci/test_ref_doc.sh
env: PURPOSE='RefDocVerify'
Expand Down
59 changes: 0 additions & 59 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@ jobs:
- bash: ./scripts/ci/dependency_check.sh
displayName: 'Verify src/azure-cli/requirements.py3.Linux.txt'

- task: UsePythonVersion@0
displayName: 'Use Python 2'
inputs:
versionSpec: 2.x

- bash: ./scripts/ci/dependency_check.sh
displayName: 'Verify src/azure-cli/requirements.py2.Linux.txt'

- job: VerifyDarwinRequirements
displayName: 'Verify src/azure-cli/requirements.*.Darwin.txt'
condition: succeeded()
Expand All @@ -111,14 +103,6 @@ jobs:
- bash: ./scripts/ci/dependency_check.sh
displayName: 'Verify src/azure-cli/requirements.py3.Darwin.txt'

- task: UsePythonVersion@0
displayName: 'Use Python 2'
inputs:
versionSpec: 2.x

- bash: ./scripts/ci/dependency_check.sh
displayName: 'Verify src/azure-cli/requirements.py2.Darwin.txt'

- job: VerifyWindowsRequirements
displayName: 'Verify src/azure-cli/requirements.*.Windows.txt'
condition: succeeded()
Expand All @@ -136,16 +120,6 @@ jobs:
filename: ./scripts/ci/dependency_check.bat
displayName: 'Verify src/azure-cli/requirements.py3.Windows.txt'

- task: UsePythonVersion@0
displayName: 'Use Python 2'
inputs:
versionSpec: 2.x

- task: BatchScript@1
inputs:
filename: ./scripts/ci/dependency_check.bat
displayName: 'Verify src/azure-cli/requirements.py2.Windows.txt'

- job: VerifyVersions
displayName: Verify Command Module Versions
condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/release'), eq(variables['System.PullRequest.TargetBranch'], 'release')))
Expand Down Expand Up @@ -372,11 +346,6 @@ jobs:
--rm -v $PYPI_FILES:/mnt/pypi python:3.8 \
/bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION && az self-test && az --version && sleep 5"
echo "== Testing pip install on Python 2.7 =="
docker run \
--rm -v $PYPI_FILES:/mnt/pypi python:2.7 \
/bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION && az self-test && az --version && sleep 5"
displayName: 'Test pip Install'
- job: UnitTest
Expand All @@ -387,9 +356,6 @@ jobs:
vmImage: 'ubuntu-16.04'
strategy:
matrix:
Python27:
python.version: '2.7'
tox_env: 'py27'
Python36:
python.version: '3.6'
tox_env: 'py36'
Expand Down Expand Up @@ -432,31 +398,6 @@ jobs:
- bash: ./scripts/ci/test_profile_integration.sh
displayName: 'Run Integration Test against Profiles'

- job: RunAutomationFullPython2
displayName: Run Automation, Python 2
dependsOn: BuildPythonWheel
timeoutInMinutes: 90

pool:
vmImage: 'ubuntu-16.04'
steps:
- task: UsePythonVersion@0
displayName: 'Use Python 2.7'
inputs:
versionSpec: 2.7
- task: DownloadPipelineArtifact@1
displayName: 'Download Python Wheels'
inputs:
TargetPath: '$(Build.ArtifactStagingDirectory)/pypi'
artifactName: pypi
- bash: |
pip install --force-reinstall wheel
- task: Bash@3
displayName: 'Run Test Automation'
inputs:
targetType: 'filePath'
filePath: ./scripts/ci/test_automation.sh

- job: RunAutomationReducedPython3_6
displayName: Run Automation Reduced Python 3.6
dependsOn: BuildPythonWheel
Expand Down
144 changes: 0 additions & 144 deletions src/azure-cli/requirements.py2.Darwin.txt

This file was deleted.

Loading

0 comments on commit afe1a01

Please sign in to comment.