From 15045f819606001181e39efb172c678e27daeb9e Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 23 May 2020 05:39:23 +0530 Subject: [PATCH 1/3] Remove duplicate jobs from Travis CI --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bb82f4e6..8d84f9581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,6 @@ jobs: env: TOXENV=docs - env: TOXENV=lint - env: TOXENV=vendoring - # Latest CPython - - env: GROUP=1 - python: 2.7 - - env: GROUP=2 - python: 2.7 - - env: GROUP=1 - - env: GROUP=2 # Complete checking for ensuring compatibility # PyPy @@ -38,19 +31,6 @@ jobs: python: pypy2.7-7.1.1 - env: GROUP=2 python: pypy2.7-7.1.1 - # Other Supported CPython - - env: GROUP=1 - python: 3.7 - - env: GROUP=2 - python: 3.7 - - env: GROUP=1 - python: 3.6 - - env: GROUP=2 - python: 3.6 - - env: GROUP=1 - python: 3.5 - - env: GROUP=2 - python: 3.5 # Test experimental stuff that are not part of the standard pip usage. # Helpful for developers working on them to see how they're doing. From 9113ef0a0a1dfac8e5573e9f78c11371ee4c5f7e Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 23 May 2020 05:59:16 +0530 Subject: [PATCH 2/3] Use Python 3.8 for "primary" run on Azure Ubuntu/MacOS --- .azure-pipelines/jobs/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml index f7dac5143..274e075a6 100644 --- a/.azure-pipelines/jobs/test.yml +++ b/.azure-pipelines/jobs/test.yml @@ -12,8 +12,8 @@ jobs: "2.7": python.version: '2.7' python.architecture: x64 - "3.6": - python.version: '3.6' + "3.8": + python.version: '3.8' python.architecture: x64 maxParallel: 2 @@ -32,12 +32,12 @@ jobs: "3.5": python.version: '3.5' python.architecture: x64 + "3.6": + python.version: '3.6' + python.architecture: x64 "3.7": python.version: '3.7' python.architecture: x64 - "3.8": - python.version: '3.8' - python.architecture: x64 maxParallel: 4 steps: From 3ffd0305d9136f5cb1dd1ee3efbde5139dcab84b Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 23 May 2020 05:42:48 +0530 Subject: [PATCH 3/3] Update CI documentation to reflect current realities --- docs/html/development/ci.rst | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst index 8b6412307..f3b64c69c 100644 --- a/docs/html/development/ci.rst +++ b/docs/html/development/ci.rst @@ -66,9 +66,9 @@ Services pip test suite and checks are distributed on three different platforms that provides free executors for open source packages: - - `Travis CI`_ (Used for Linux) - - `Azure DevOps CI`_ (Linux, MacOS & Windows tests) - - `GitHub Actions`_ (Linux, MacOS & Windows tests) + - `GitHub Actions`_ (Used for code quality and development tasks) + - `Azure DevOps CI`_ (Used for tests) + - `Travis CI`_ (Used for PyPy tests) .. _`Travis CI`: https://travis-ci.org/ .. _`Azure DevOps CI`: https://azure.microsoft.com/en-us/services/devops/ @@ -81,13 +81,13 @@ Current run tests Developer tasks --------------- -======== =============== ================ ================== ============ - OS docs lint vendoring packages -======== =============== ================ ================== ============ -Linux Travis, Github Travis, Github Travis, Github Azure -Windows Azure -MacOS Azure -======== =============== ================ ================== ============ +======== =============== ================ ================== ============= + OS docs lint vendoring packaging +======== =============== ================ ================== ============= +Linux Travis, Github Travis, Github Travis, Github Azure +Windows Github Github Github Azure +MacOS Github Github Github Azure +======== =============== ================ ================== ============= Actual testing -------------- @@ -137,15 +137,15 @@ Actual testing | | +-------+---------------+-----------------+ | | | PyPy3 | | | | Linux +----------+-------+---------------+-----------------+ -| | | CP2.7 | Travis,Azure | Travis,Azure | +| | | CP2.7 | Azure | Azure | | | +-------+---------------+-----------------+ -| | | CP3.5 | Travis,Azure | Travis,Azure | +| | | CP3.5 | Azure | Azure | | | +-------+---------------+-----------------+ -| | | CP3.6 | Travis,Azure | Travis,Azure | +| | | CP3.6 | Azure | Azure | | | +-------+---------------+-----------------+ -| | x64 | CP3.7 | Travis,Azure | Travis,Azure | +| | x64 | CP3.7 | Azure | Azure | | | +-------+---------------+-----------------+ -| | | CP3.8 | Travis | Travis | +| | | CP3.8 | Azure | Azure | | | +-------+---------------+-----------------+ | | | PyPy | Travis | Travis | | | +-------+---------------+-----------------+ @@ -173,7 +173,7 @@ Actual testing | | +-------+---------------+-----------------+ | | x64 | CP3.7 | Azure | Azure | | | +-------+---------------+-----------------+ -| | | CP3.8 | | | +| | | CP3.8 | Azure | Azure | | | +-------+---------------+-----------------+ | | | PyPy | | | | | +-------+---------------+-----------------+