From 44d6a12b8ce22297280f2f106c0215a2f9dd319a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 17 Aug 2019 22:07:48 +0200
Subject: [PATCH 1/3] ci: Travis: use 3.5.0

Ref: https://github.com/pytest-dev/pytest/pull/5752#issuecomment-522241225
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5de40f3a454..7f111270c24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
       python: 'pypy3'
 
     - env: TOXENV=py35-xdist
-      python: '3.5'
+      python: '3.5.0'
 
     # Coverage for:
     # - pytester's LsofFdLeakChecker

From 35a67d29a87cd101a0372379678ec26ab6ed65f4 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 17 Aug 2019 22:09:04 +0200
Subject: [PATCH 2/3] TEMP: Travis: only 3.5.0

---
 .travis.yml         | 69 ----------------------------------------
 azure-pipelines.yml | 77 ---------------------------------------------
 2 files changed, 146 deletions(-)
 delete mode 100644 azure-pipelines.yml

diff --git a/.travis.yml b/.travis.yml
index 7f111270c24..939af54722f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,78 +22,9 @@ install:
 
 jobs:
   include:
-    # OSX tests - first (in test stage), since they are the slower ones.
-    - os: osx
-      osx_image: xcode10.1
-      language: generic
-      env: TOXENV=py37-xdist PYTEST_COVERAGE=1
-      before_install:
-        - which python3
-        - python3 -V
-        - ln -sfn "$(which python3)" /usr/local/bin/python
-        - python -V
-        - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37
-
-    # Full run of latest supported version, without xdist.
-    - env: TOXENV=py37
-      python: '3.7'
-
-    # Coverage tracking is slow with pypy, skip it.
-    - env: TOXENV=pypy3-xdist
-      python: 'pypy3'
-
     - env: TOXENV=py35-xdist
       python: '3.5.0'
 
-    # Coverage for:
-    # - pytester's LsofFdLeakChecker
-    # - TestArgComplete (linux only)
-    # - numpy
-    # Empty PYTEST_ADDOPTS to run this non-verbose.
-    - env: TOXENV=py37-lsof-numpy-twisted-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
-
-    # Specialized factors for py37.
-    # Coverage for:
-    # - test_sys_breakpoint_interception (via pexpect).
-    - env: TOXENV=py37-pexpect PYTEST_COVERAGE=1
-    - env: TOXENV=py37-pluggymaster-xdist
-    - env: TOXENV=py37-freeze
-
-    - env: TOXENV=py38-xdist
-      python: '3.8-dev'
-
-    - stage: baseline
-      env: TOXENV=py36-xdist
-      python: '3.6'
-    - env: TOXENV=linting,docs,doctesting PYTEST_COVERAGE=1
-      cache:
-        directories:
-          - $HOME/.cache/pre-commit
-
-    - stage: deploy
-      python: '3.6'
-      install: pip install -U setuptools setuptools_scm tox
-      script: skip
-      # token to upload github release notes: GH_RELEASE_NOTES_TOKEN
-      env:
-        - secure: "OjOeL7/0JUDkV00SsTs732e8vQjHynpbG9FKTNtZZJ+1Zn4Cib+hAlwmlBnvVukML0X60YpcfjnC4quDOIGLPsh5zeXnvJmYtAIIUNQXjWz8NhcGYrhyzuP1rqV22U68RTCdmOq3lMYU/W2acwHP7T49PwJtOiUM5kF120UAQ0Zi5EmkqkIvH8oM5mO9Dlver+/U7Htpz9rhKrHBXQNCMZI6yj2aUyukqB2PN2fjAlDbCF//+FmvYw9NjT4GeFOSkTCf4ER9yfqs7yglRfwiLtOCZ2qKQhWZNsSJDB89rxIRXWavJUjJKeY2EW2/NkomYJDpqJLIF4JeFRw/HhA47CYPeo6BJqyyNV+0CovL1frpWfi9UQw2cMbgFUkUIUk3F6DD59PHNIOX2R/HX56dQsw7WKl3QuHlCOkICXYg8F7Ta684IoKjeTX03/6QNOkURfDBwfGszY0FpbxrjCSWKom6RyZdyidnESaxv9RzjcIRZVh1rp8KMrwS1OrwRSdG0zjlsPr49hWMenN/8fKgcHTV4/r1Tj6mip0dorSRCrgUNIeRBKgmui6FS8642ab5JNKOxMteVPVR2sFuhjOQ0Jy+PmvceYY9ZMWc3+/B/KVh0dZ3hwvLGZep/vxDS2PwCA5/xw31714vT5LxidKo8yECjBynMU/wUTTS695D3NY="
-      addons:
-        apt:
-          packages:
-            # required by publish_gh_release_notes
-            - pandoc
-      after_deploy: tox -e publish_gh_release_notes
-      deploy:
-        provider: pypi
-        user: nicoddemus
-        distributions: sdist bdist_wheel
-        skip_upload_docs: true
-        password:
-          secure: xanTgTUu6XDQVqB/0bwJQXoDMnU5tkwZc5koz6mBkkqZhKdNOi2CLoC1XhiSZ+ah24l4V1E0GAqY5kBBcy9d7NVe4WNg4tD095LsHw+CRU6/HCVIFfyk2IZ+FPAlguesCcUiJSXOrlBF+Wj68wEvLoK7EoRFbJeiZ/f91Ww1sbtDlqXABWGHrmhPJL5Wva7o7+wG7JwJowqdZg1pbQExsCc7b53w4v2RBu3D6TJaTAzHiVsW+nUSI67vKI/uf+cR/OixsTfy37wlHgSwihYmrYLFls3V0bSpahCim3bCgMaFZx8S8xrdgJ++PzBCof2HeflFKvW+VCkoYzGEG4NrTWJoNz6ni4red9GdvfjGH3YCjAKS56h9x58zp2E5rpsb/kVq5/45xzV+dq6JRuhQ1nJWjBC6fSKAc/bfwnuFK3EBxNLkvBssLHvsNjj5XG++cB8DdS9wVGUqjpoK4puaXUWFqy4q3S9F86HEsKNgExtieA9qNx+pCIZVs6JCXZNjr0I5eVNzqJIyggNgJG6RyravsU35t9Zd9doL5g4Y7UKmAGTn1Sz24HQ4sMQgXdm2SyD8gEK5je4tlhUvfGtDvMSlstq71kIn9nRpFnqB6MFlbYSEAZmo8dGbCquoUc++6Rum208wcVbrzzVtGlXB/Ow9AbFMYeAGA0+N/K1e59c=
-        on:
-          tags: true
-          repo: pytest-dev/pytest
-
 matrix:
   allow_failures:
     - python: '3.8-dev'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index f18ce08877a..00000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-trigger:
-- master
-- features
-
-variables:
-  PYTEST_ADDOPTS: "--junitxml=build/test-results/$(tox.env).xml -vv"
-  PYTEST_COVERAGE: '0'
-
-jobs:
-
-- job: 'Test'
-  pool:
-    vmImage: "vs2017-win2016"
-  strategy:
-    matrix:
-      # -- pypy3 disabled for now: #5279 --
-      # pypy3:
-      #   python.version: 'pypy3'
-      #   tox.env: 'pypy3'
-      py35-xdist:
-        python.version: '3.5'
-        tox.env: 'py35-xdist'
-        # Coverage for:
-        # - test_supports_breakpoint_module_global
-        PYTEST_COVERAGE: '1'
-      py36-xdist:
-        python.version: '3.6'
-        tox.env: 'py36-xdist'
-      py37:
-        python.version: '3.7'
-        tox.env: 'py37-twisted-numpy'
-        # Coverage for:
-        # - _py36_windowsconsoleio_workaround (with py36+)
-        # - test_request_garbage (no xdist)
-        PYTEST_COVERAGE: '1'
-      py37-linting/docs/doctesting:
-        python.version: '3.7'
-        tox.env: 'linting,docs,doctesting'
-      py37-pluggymaster-xdist:
-        python.version: '3.7'
-        tox.env: 'py37-pluggymaster-xdist'
-    maxParallel: 10
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '$(python.version)'
-      architecture: 'x64'
-
-  - script: python -m pip install --upgrade pip && python -m pip install tox
-    displayName: 'Install tox'
-
-  - bash: |
-      if [[ "$PYTEST_COVERAGE" == "1" ]]; then
-        export _PYTEST_TOX_COVERAGE_RUN="coverage run -m"
-        export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
-        export COVERAGE_FILE="$PWD/.coverage"
-        export COVERAGE_PROCESS_START="$PWD/.coveragerc"
-      fi
-      python -m tox -e $(tox.env)
-    displayName: 'Run tests'
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: 'build/test-results/$(tox.env).xml'
-      testRunTitle: '$(tox.env)'
-    condition: succeededOrFailed()
-
-  - bash: |
-      if [[ "$PYTEST_COVERAGE" == 1 ]]; then
-        scripts/report-coverage.sh
-      fi
-    env:
-      CODECOV_NAME: $(tox.env)
-      CODECOV_TOKEN: $(CODECOV_TOKEN)
-    displayName: Report and upload coverage
-    condition: eq(variables['PYTEST_COVERAGE'], '1')

From 8560124128127abd377bac561c701726936f24e5 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 17 Aug 2019 22:42:21 +0200
Subject: [PATCH 3/3] dist: trusty

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 939af54722f..5f0e69a6727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ install:
 jobs:
   include:
     - env: TOXENV=py35-xdist
+      dist: trusty
       python: '3.5.0'
 
 matrix: