Skip to content

Commit

Permalink
Merge pull request #10412 from jdufresne/ci
Browse files Browse the repository at this point in the history 
Clean up leftover references to removed Travis and Azure CI
  • Loading branch information
@sbidoul
sbidoul committed Aug 29, 2021
2 parents a4f5d48 + a775351 commit 65f046d
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 37 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ jobs:
with:
python-version: ${{ matrix.python }}

- name: Install Ubuntu dependencies
if: matrix.os == 'Ubuntu'
run: sudo apt-get install bzr

- name: Install MacOS dependencies
if: matrix.os == 'MacOS'
run: brew install bzr

- run: pip install tox 'virtualenv<20'

# Main check
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ include docs/requirements.txt
exclude .coveragerc
exclude .mailmap
exclude .appveyor.yml
exclude .travis.yml
exclude .readthedocs.yml
exclude .pre-commit-config.yaml
exclude tox.ini
Expand All @@ -30,7 +29,6 @@ exclude src/pip/_vendor/six/moves
recursive-exclude src/pip/_vendor *.pyi

prune .github
prune .azure-pipelines
prune docs/build
prune news
prune tasks
Expand Down
4 changes: 1 addition & 3 deletions docs/html/development/architecture/anatomy.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
* ``.gitignore``
* ``.mailmap``
* ``.readthedocs.yml``
* ``.travis.yml``
* ``docs/`` *[documentation, built with Sphinx]*

* ``html/`` *[sources to HTML documentation avail. online]*
Expand All @@ -52,8 +51,7 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
* ``lib/`` *[helpers for tests]*
* ``unit/`` *[unit tests -- fast and small and nice!]*

* ``tools`` *[misc development workflow tools, like requirements files & Travis CI files & helpers for tox]*
* ``.azure-pipelines``
* ``tools`` *[misc development workflow tools, like requirements files & CI files & helpers for tox]*
* ``.github``
* ``.tox``

Expand Down
48 changes: 27 additions & 21 deletions docs/html/development/ci.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pip support a variety of Python interpreters:
- CPython 3.6
- CPython 3.7
- CPython 3.8
- CPython 3.9
- Latest PyPy3

on different operating systems:
Expand Down Expand Up @@ -61,15 +62,9 @@ interpreters.
Services
========

pip test suite and checks are distributed on three different platforms that
provides free executors for open source packages:
pip test suite and checks are distributed on `GitHub Actions`_ which provides
free executors for open source packages.

- `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/
.. _`GitHub Actions`: https://github.com/features/actions


Expand All @@ -82,9 +77,9 @@ Developer tasks
======== =============== ================ ================== =============
OS docs lint vendoring packaging
======== =============== ================ ================== =============
Linux Travis, Github Travis, Github Travis, Github Azure
Windows Github Github Github Azure
MacOS Github Github Github Azure
Linux Github Github Github Github
Windows Github Github Github Github
MacOS Github Github Github Github
======== =============== ================ ================== =============

Actual testing
Expand All @@ -93,20 +88,23 @@ Actual testing
+------------------------------+---------------+-----------------+
| **interpreter** | **unit** | **integration** |
+-----------+----------+-------+---------------+-----------------+
| | | CP3.6 | | |
| | +-------+---------------+-----------------+
| | | CP3.6 | Azure | |
| | x86 | CP3.7 | | |
| | +-------+---------------+-----------------+
| | x86 | CP3.7 | Azure | |
| | | CP3.8 | | |
| | +-------+---------------+-----------------+
| | | CP3.8 | Azure | |
| | | CP3.9 | | |
| | +-------+---------------+-----------------+
| | | PyPy3 | | |
| Windows +----------+-------+---------------+-----------------+
| | | CP3.6 | Azure | |
| | | CP3.6 | Github | Github |
| | +-------+---------------+-----------------+
| | x64 | CP3.7 | | |
| | +-------+---------------+-----------------+
| | x64 | CP3.7 | Azure | |
| | | CP3.8 | | |
| | +-------+---------------+-----------------+
| | | CP3.8 | Azure | Azure |
| | | CP3.9 | Github | Github |
| | +-------+---------------+-----------------+
| | | PyPy3 | | |
+-----------+----------+-------+---------------+-----------------+
Expand All @@ -116,22 +114,28 @@ Actual testing
| | +-------+---------------+-----------------+
| | | CP3.8 | | |
| | +-------+---------------+-----------------+
| | | CP3.9 | | |
| | +-------+---------------+-----------------+
| | | PyPy3 | | |
| Linux +----------+-------+---------------+-----------------+
| | | CP3.6 | Azure | Azure |
| | | CP3.6 | Github | Github |
| | +-------+---------------+-----------------+
| | x64 | CP3.7 | Github | Github |
| | +-------+---------------+-----------------+
| | x64 | CP3.7 | Azure | Azure |
| | | CP3.8 | Github | Github |
| | +-------+---------------+-----------------+
| | | CP3.8 | Azure | Azure |
| | | CP3.9 | Github | Github |
| | +-------+---------------+-----------------+
| | | PyPy3 | Travis | Travis |
| | | PyPy3 | | |
+-----------+----------+-------+---------------+-----------------+
| | | CP3.6 | | |
| | +-------+---------------+-----------------+
| | x86 | CP3.7 | | |
| | +-------+---------------+-----------------+
| | | CP3.8 | | |
| | +-------+---------------+-----------------+
| | | CP3.9 | | |
| | +-------+---------------+-----------------+
| | | PyPy3 | | |
| MacOS +----------+-------+---------------+-----------------+
| | | CP3.6 | Github | Github |
Expand All @@ -140,5 +144,7 @@ Actual testing
| | +-------+---------------+-----------------+
| | | CP3.8 | Github | Github |
| | +-------+---------------+-----------------+
| | | CP3.9 | Github | Github |
| | +-------+---------------+-----------------+
| | | PyPy3 | | |
+-----------+----------+-------+---------------+-----------------+
9 changes: 2 additions & 7 deletions docs/html/development/contributing.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ separately, as a "formatting cleanup" PR, if needed.
Automated Testing
=================

All pull requests and merges to 'main' branch are tested using `Travis CI`_,
`Azure Pipelines`_ and `GitHub Actions`_ based on our `.travis.yml`_,
`.azure-pipelines`_ and `.github/workflows`_ files. More details about pip's
All pull requests and merges to 'main' branch are tested using `GitHub
Actions`_ based on our `.github/workflows`_ files. More details about pip's
Continuous Integration can be found in the `CI Documentation`_


Expand Down Expand Up @@ -264,11 +263,7 @@ will initiate a vote among the existing maintainers.

.. _`Studies have shown`: https://www.kessler.de/prd/smartbear/BestPracticesForPeerCodeReview.pdf
.. _`resolve merge conflicts`: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line
.. _`Travis CI`: https://travis-ci.org/
.. _`Azure Pipelines`: https://azure.microsoft.com/en-in/services/devops/pipelines/
.. _`GitHub Actions`: https://github.com/features/actions
.. _`.travis.yml`: https://github.com/pypa/pip/blob/main/.travis.yml
.. _`.azure-pipelines`: https://github.com/pypa/pip/blob/main/.azure-pipelines
.. _`.github/workflows`: https://github.com/pypa/pip/blob/main/.github/workflows
.. _`CI Documentation`: https://pip.pypa.io/en/latest/development/ci/
.. _`towncrier`: https://pypi.org/project/towncrier/
Expand Down
Empty file added news/c4f8e2e5-7603-4ab4-8992-868ec1258d3a.trivial.rst
View file
Empty file.
6 changes: 4 additions & 2 deletions tests/functional/test_vcs_bazaar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import os
import sys

import pytest

Expand All @@ -12,10 +13,11 @@


@pytest.mark.skipif(
"TRAVIS" not in os.environ, reason="Bazaar is only required under Travis"
sys.platform == "win32" or "CI" not in os.environ,
reason="Bazaar is only required under CI",
)
def test_ensure_bzr_available():
"""Make sure that bzr is available when running in Travis."""
"""Make sure that bzr is available when running in CI."""
assert is_bzr_installed()


Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_vcs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@


@pytest.mark.skipif(
"TRAVIS" not in os.environ, reason="Subversion is only required under Travis"
"CI" not in os.environ, reason="Subversion is only required under CI"
)
def test_ensure_svn_available():
"""Make sure that svn is available when running in Travis."""
"""Make sure that svn is available when running in CI."""
assert is_svn_installed()


Expand Down

0 comments on commit 65f046d

Please sign in to comment.