From 2e90a6fd9859c1466629af1cbc9f3d7521163753 Mon Sep 17 00:00:00 2001 From: David Staheli Date: Fri, 9 Nov 2018 15:56:30 -0500 Subject: [PATCH] Remove old .vsts-ci directory and its contents --- .vsts-ci/docs.yml | 20 ---------- .vsts-ci/linux.yml | 27 -------------- .vsts-ci/phases/run-manifest-check.yml | 14 ------- .vsts-ci/phases/run-tests-windows.yml | 12 ------ .vsts-ci/phases/run-tests.yml | 37 ------------------- .vsts-ci/phases/run-vendor-scripts.yml | 39 -------------------- .vsts-ci/phases/test.yml | 49 ------------------------- .vsts-ci/steps/create-virtualenv.yml | 6 --- .vsts-ci/steps/install-dependencies.yml | 3 -- .vsts-ci/steps/run-tests.yml | 23 ------------ .vsts-ci/windows.yml | 23 ------------ 11 files changed, 253 deletions(-) delete mode 100644 .vsts-ci/docs.yml delete mode 100644 .vsts-ci/linux.yml delete mode 100644 .vsts-ci/phases/run-manifest-check.yml delete mode 100644 .vsts-ci/phases/run-tests-windows.yml delete mode 100644 .vsts-ci/phases/run-tests.yml delete mode 100644 .vsts-ci/phases/run-vendor-scripts.yml delete mode 100644 .vsts-ci/phases/test.yml delete mode 100644 .vsts-ci/steps/create-virtualenv.yml delete mode 100644 .vsts-ci/steps/install-dependencies.yml delete mode 100644 .vsts-ci/steps/run-tests.yml delete mode 100644 .vsts-ci/windows.yml diff --git a/.vsts-ci/docs.yml b/.vsts-ci/docs.yml deleted file mode 100644 index 1b9d3701..00000000 --- a/.vsts-ci/docs.yml +++ /dev/null @@ -1,20 +0,0 @@ -phases: -- phase: - displayName: Docs - queue: Hosted Linux Preview - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.7' - - - template: steps/install-dependencies.yml - - - bash: tox -e docs - displayName: Build docs - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: docs' - inputs: - PathtoPublish: docs/build - ArtifactName: docs diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml deleted file mode 100644 index 95c62dc5..00000000 --- a/.vsts-ci/linux.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Pipenv Build Rules -trigger: - batch: true - branches: - include: - - master - paths: - exclude: - - docs/* - - news/* - - README.md - - pipenv/*.txt - - CHANGELOG.rst - - CONTRIBUTING.md - - CODE_OF_CONDUCT.md - - .gitignore - - .gitattributes - - .editorconfig - -phases: -- template: phases/test.yml - parameters: - queue: Hosted Linux Preview - -- template: phases/run-vendor-scripts.yml - parameters: - queue: Hosted Linux Preview diff --git a/.vsts-ci/phases/run-manifest-check.yml b/.vsts-ci/phases/run-manifest-check.yml deleted file mode 100644 index 484641dc..00000000 --- a/.vsts-ci/phases/run-manifest-check.yml +++ /dev/null @@ -1,14 +0,0 @@ -steps: -- task: UsePythonVersion@0 - displayName: Use Python $(python.version) - inputs: - versionSpec: '$(python.version)' - architecture: '$(python.architecture)' - -- template: ../steps/install-dependencies.yml - -- bash: | - export GIT_SSL_CAINFO=$(python -m certifi) - export LANG=C.UTF-8 - python -m pip install check-manifest - check-manifest diff --git a/.vsts-ci/phases/run-tests-windows.yml b/.vsts-ci/phases/run-tests-windows.yml deleted file mode 100644 index 6b6f86fa..00000000 --- a/.vsts-ci/phases/run-tests-windows.yml +++ /dev/null @@ -1,12 +0,0 @@ -steps: -- task: UsePythonVersion@0 - displayName: Use Python $(python.version) - inputs: - versionSpec: '$(python.version)' - architecture: '$(python.architecture)' - -- template: ../steps/install-dependencies.yml - -- template: ../steps/create-virtualenv.yml - -- template: ../steps/run-tests.yml diff --git a/.vsts-ci/phases/run-tests.yml b/.vsts-ci/phases/run-tests.yml deleted file mode 100644 index fe35ad8d..00000000 --- a/.vsts-ci/phases/run-tests.yml +++ /dev/null @@ -1,37 +0,0 @@ -steps: -- task: UsePythonVersion@0 - displayName: Use Python $(python.version) - inputs: - versionSpec: '$(python.version)' - architecture: '$(python.architecture)' - -- template: ../steps/install-dependencies.yml - -- bash: | - mkdir -p "$AGENT_HOMEDIRECTORY/.virtualenvs" - mkdir -p "$WORKON_HOME" - pip install certifi - export GIT_SSL_CAINFO="$(python -m certifi)" - export LANG="C.UTF-8" - export PIP_PROCESS_DEPENDENCY_LINKS="1" - echo "Path $PATH" - echo "Installing Pipenv…" - pip install -e "$(pwd)" --upgrade - pipenv install --deploy --dev - echo pipenv --venv && echo pipenv --py && echo pipenv run python --version - displayName: Make Virtualenv - -- script: | - # Fix Git SSL errors - export GIT_SSL_CAINFO="$(python -m certifi)" - export LANG="C.UTF-8" - export PIP_PROCESS_DEPENDENCY_LINKS="1" - pipenv run pytest --junitxml=test-results.xml - displayName: Run integration tests - -- task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() diff --git a/.vsts-ci/phases/run-vendor-scripts.yml b/.vsts-ci/phases/run-vendor-scripts.yml deleted file mode 100644 index b96f64f5..00000000 --- a/.vsts-ci/phases/run-vendor-scripts.yml +++ /dev/null @@ -1,39 +0,0 @@ -parameters: - queue: - -phases: -- phase: Vendor_Scripts - displayName: Test Vendor Scripts - - queue: - name: ${{ parameters.queue }} - parallel: 4 - matrix: - ${{ if eq(parameters.queue, 'Hosted VS2017') }}: - # TODO remove once Hosted VS2017 has Python 3.7 - Python37: - python.version: '>= 3.7.0-b2' - python.architecture: x64 - ${{ if ne(parameters.queue, 'Hosted VS2017' )}}: - Python37: - python.version: '>= 3.7' - python.architecture: x64 - steps: - - task: UsePythonVersion@0 - displayName: Use Python $(python.version) - inputs: - versionSpec: '$(python.version)' - architecture: '$(python.architecture)' - - - template: ../steps/install-dependencies.yml - - - bash: | - mkdir -p "$AGENT_HOMEDIRECTORY/.virtualenvs" - mkdir -p "$WORKON_HOME" - pip install certifi - export GIT_SSL_CAINFO=$(python -m certifi) - export LANG=C.UTF-8 - python -m pip install --upgrade invoke requests parver - python -m invoke vendoring.update - - - template: ./run-manifest-check.yml diff --git a/.vsts-ci/phases/test.yml b/.vsts-ci/phases/test.yml deleted file mode 100644 index b0de1e23..00000000 --- a/.vsts-ci/phases/test.yml +++ /dev/null @@ -1,49 +0,0 @@ -parameters: - queue: - -phases: -- phase: Test_Primary - displayName: Test Primary - - queue: - name: ${{ parameters.queue }} - parallel: 4 - matrix: - Python27: - python.version: '2.7' - python.architecture: x64 - ${{ if eq(parameters.queue, 'Hosted VS2017') }}: - # TODO remove once Hosted VS2017 has Python 3.7 - Python37: - python.version: '>= 3.7.0-b2' - python.architecture: x64 - ${{ if ne(parameters.queue, 'Hosted VS2017' )}}: - Python37: - python.version: '>= 3.7' - python.architecture: x64 - steps: - - ${{ if eq(parameters.queue, 'Hosted VS2017') }}: - - template: ./run-tests-windows.yml - - - ${{ if ne(parameters.queue, 'Hosted VS2017') }}: - - template: ./run-tests.yml - -- phase: Test_Secondary - displayName: Test python3.6 - # Run after Test_Primary so we don't devour time and jobs if tests are going to fail -# dependsOn: Test_Primary - - queue: - name: ${{ parameters.queue }} - parallel: 4 - matrix: - Python36: - python.version: '3.6' - python.architecture: x64 - steps: - - ${{ if eq(parameters.queue, 'Hosted VS2017') }}: - - template: ./run-tests-windows.yml - - - ${{ if ne(parameters.queue, 'Hosted VS2017') }}: - - template: ./run-tests.yml - diff --git a/.vsts-ci/steps/create-virtualenv.yml b/.vsts-ci/steps/create-virtualenv.yml deleted file mode 100644 index a72e9964..00000000 --- a/.vsts-ci/steps/create-virtualenv.yml +++ /dev/null @@ -1,6 +0,0 @@ -steps: -- script: | - virtualenv D:\.venv - D:\.venv\Scripts\pip.exe install -e . && D:\.venv\Scripts\pipenv install --dev - echo D:\.venv\Scripts\pipenv --venv && echo D:\.venv\Scripts\pipenv --py && echo D:\.venv\Scripts\pipenv run python --version - displayName: Make Virtualenv diff --git a/.vsts-ci/steps/install-dependencies.yml b/.vsts-ci/steps/install-dependencies.yml deleted file mode 100644 index dfe733b6..00000000 --- a/.vsts-ci/steps/install-dependencies.yml +++ /dev/null @@ -1,3 +0,0 @@ -steps: -- script: 'python -m pip install --upgrade pip && python -m pip install -e .' - displayName: Upgrade Pip & Install Pipenv diff --git a/.vsts-ci/steps/run-tests.yml b/.vsts-ci/steps/run-tests.yml deleted file mode 100644 index a7b99a13..00000000 --- a/.vsts-ci/steps/run-tests.yml +++ /dev/null @@ -1,23 +0,0 @@ -steps: -- powershell: | - # Fix Git SSL errors - pip install certifi - python -m certifi > cacert.txt - Write-Host "##vso[task.setvariable variable=GIT_SSL_CAINFO]$(Get-Content cacert.txt)" - $env:GIT_SSL_CAINFO="$(Get-Content cacert.txt)" - # Shorten paths to get under MAX_PATH or else integration tests will fail - # https://bugs.python.org/issue18199 - subst T: "$env:TEMP" - Write-Host "##vso[task.setvariable variable=TEMP]T:\" - $env:TEMP='T:\' - Write-Host "##vso[task.setvariable variable=TMP]T:\" - $env:TEMP='T:\' - D:\.venv\Scripts\pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests - displayName: Run integration tests - -- task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml deleted file mode 100644 index e423c3ab..00000000 --- a/.vsts-ci/windows.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Pipenv Build Rules -trigger: - batch: true - branches: - include: - - master - paths: - exclude: - - docs/* - - news/* - - README.md - - pipenv/*.txt - - CHANGELOG.rst - - CONTRIBUTING.md - - CODE_OF_CONDUCT.md - - .gitignore - - .gitattributes - - .editorconfig - -phases: -- template: phases/test.yml - parameters: - queue: Hosted VS2017