Skip to content

Commit 65f046d

Browse files
sbidoulsbidoul
authored
Merge pull request #10412 from jdufresne/ci
Clean up leftover references to removed Travis and Azure CI
2 parents a4f5d48 + a775351 commit 65f046d

File tree

8 files changed

+44
-37
lines changed

8 files changed

+44
-37
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ jobs:
104104
with:
105105
python-version: ${{ matrix.python }}
106106

107+
- name: Install Ubuntu dependencies
108+
if: matrix.os == 'Ubuntu'
109+
run: sudo apt-get install bzr
110+
111+
- name: Install MacOS dependencies
112+
if: matrix.os == 'MacOS'
113+
run: brew install bzr
114+
107115
- run: pip install tox 'virtualenv<20'
108116

109117
# Main check

‎MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ include docs/requirements.txt
1515
exclude .coveragerc
1616
exclude .mailmap
1717
exclude .appveyor.yml
18-
exclude .travis.yml
1918
exclude .readthedocs.yml
2019
exclude .pre-commit-config.yaml
2120
exclude tox.ini
@@ -30,7 +29,6 @@ exclude src/pip/_vendor/six/moves
3029
recursive-exclude src/pip/_vendor *.pyi
3130

3231
prune .github
33-
prune .azure-pipelines
3432
prune docs/build
3533
prune news
3634
prune tasks

‎docs/html/development/architecture/anatomy.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
3030
* ``.gitignore``
3131
* ``.mailmap``
3232
* ``.readthedocs.yml``
33-
* ``.travis.yml``
3433
* ``docs/`` *[documentation, built with Sphinx]*
3534

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

55-
* ``tools`` *[misc development workflow tools, like requirements files & Travis CI files & helpers for tox]*
56-
* ``.azure-pipelines``
54+
* ``tools`` *[misc development workflow tools, like requirements files & CI files & helpers for tox]*
5755
* ``.github``
5856
* ``.tox``
5957

‎docs/html/development/ci.rst

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pip support a variety of Python interpreters:
2121
- CPython 3.6
2222
- CPython 3.7
2323
- CPython 3.8
24+
- CPython 3.9
2425
- Latest PyPy3
2526

2627
on different operating systems:
@@ -61,15 +62,9 @@ interpreters.
6162
Services
6263
========
6364

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

67-
- `GitHub Actions`_ (Used for code quality and development tasks)
68-
- `Azure DevOps CI`_ (Used for tests)
69-
- `Travis CI`_ (Used for PyPy tests)
70-
71-
.. _`Travis CI`: https://travis-ci.org/
72-
.. _`Azure DevOps CI`: https://azure.microsoft.com/en-us/services/devops/
7368
.. _`GitHub Actions`: https://github.com/features/actions
7469

7570

@@ -82,9 +77,9 @@ Developer tasks
8277
======== =============== ================ ================== =============
8378
OS docs lint vendoring packaging
8479
======== =============== ================ ================== =============
85-
Linux Travis, Github Travis, Github Travis, Github Azure
86-
Windows Github Github Github Azure
87-
MacOS Github Github Github Azure
80+
Linux Github Github Github Github
81+
Windows Github Github Github Github
82+
MacOS Github Github Github Github
8883
======== =============== ================ ================== =============
8984

9085
Actual testing
@@ -93,20 +88,23 @@ Actual testing
9388
+------------------------------+---------------+-----------------+
9489
| **interpreter** | **unit** | **integration** |
9590
+-----------+----------+-------+---------------+-----------------+
91+
| | | CP3.6 | | |
9692
| | +-------+---------------+-----------------+
97-
| | | CP3.6 | Azure | |
93+
| | x86 | CP3.7 | | |
9894
| | +-------+---------------+-----------------+
99-
| | x86 | CP3.7 | Azure | |
95+
| | | CP3.8 | | |
10096
| | +-------+---------------+-----------------+
101-
| | | CP3.8 | Azure | |
97+
| | | CP3.9 | | |
10298
| | +-------+---------------+-----------------+
10399
| | | PyPy3 | | |
104100
| Windows +----------+-------+---------------+-----------------+
105-
| | | CP3.6 | Azure | |
101+
| | | CP3.6 | Github | Github |
102+
| | +-------+---------------+-----------------+
103+
| | x64 | CP3.7 | | |
106104
| | +-------+---------------+-----------------+
107-
| | x64 | CP3.7 | Azure | |
105+
| | | CP3.8 | | |
108106
| | +-------+---------------+-----------------+
109-
| | | CP3.8 | Azure | Azure |
107+
| | | CP3.9 | Github | Github |
110108
| | +-------+---------------+-----------------+
111109
| | | PyPy3 | | |
112110
+-----------+----------+-------+---------------+-----------------+
@@ -116,22 +114,28 @@ Actual testing
116114
| | +-------+---------------+-----------------+
117115
| | | CP3.8 | | |
118116
| | +-------+---------------+-----------------+
117+
| | | CP3.9 | | |
118+
| | +-------+---------------+-----------------+
119119
| | | PyPy3 | | |
120120
| Linux +----------+-------+---------------+-----------------+
121-
| | | CP3.6 | Azure | Azure |
121+
| | | CP3.6 | Github | Github |
122+
| | +-------+---------------+-----------------+
123+
| | x64 | CP3.7 | Github | Github |
122124
| | +-------+---------------+-----------------+
123-
| | x64 | CP3.7 | Azure | Azure |
125+
| | | CP3.8 | Github | Github |
124126
| | +-------+---------------+-----------------+
125-
| | | CP3.8 | Azure | Azure |
127+
| | | CP3.9 | Github | Github |
126128
| | +-------+---------------+-----------------+
127-
| | | PyPy3 | Travis | Travis |
129+
| | | PyPy3 | | |
128130
+-----------+----------+-------+---------------+-----------------+
129131
| | | CP3.6 | | |
130132
| | +-------+---------------+-----------------+
131133
| | x86 | CP3.7 | | |
132134
| | +-------+---------------+-----------------+
133135
| | | CP3.8 | | |
134136
| | +-------+---------------+-----------------+
137+
| | | CP3.9 | | |
138+
| | +-------+---------------+-----------------+
135139
| | | PyPy3 | | |
136140
| MacOS +----------+-------+---------------+-----------------+
137141
| | | CP3.6 | Github | Github |
@@ -140,5 +144,7 @@ Actual testing
140144
| | +-------+---------------+-----------------+
141145
| | | CP3.8 | Github | Github |
142146
| | +-------+---------------+-----------------+
147+
| | | CP3.9 | Github | Github |
148+
| | +-------+---------------+-----------------+
143149
| | | PyPy3 | | |
144150
+-----------+----------+-------+---------------+-----------------+

‎docs/html/development/contributing.rst

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ separately, as a "formatting cleanup" PR, if needed.
3939
Automated Testing
4040
=================
4141

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

4746

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

265264
.. _`Studies have shown`: https://www.kessler.de/prd/smartbear/BestPracticesForPeerCodeReview.pdf
266265
.. _`resolve merge conflicts`: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line
267-
.. _`Travis CI`: https://travis-ci.org/
268-
.. _`Azure Pipelines`: https://azure.microsoft.com/en-in/services/devops/pipelines/
269266
.. _`GitHub Actions`: https://github.com/features/actions
270-
.. _`.travis.yml`: https://github.com/pypa/pip/blob/main/.travis.yml
271-
.. _`.azure-pipelines`: https://github.com/pypa/pip/blob/main/.azure-pipelines
272267
.. _`.github/workflows`: https://github.com/pypa/pip/blob/main/.github/workflows
273268
.. _`CI Documentation`: https://pip.pypa.io/en/latest/development/ci/
274269
.. _`towncrier`: https://pypi.org/project/towncrier/

‎news/c4f8e2e5-7603-4ab4-8992-868ec1258d3a.trivial.rst

Whitespace-only changes.

‎tests/functional/test_vcs_bazaar.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44

55
import os
6+
import sys
67

78
import pytest
89

@@ -12,10 +13,11 @@
1213

1314

1415
@pytest.mark.skipif(
15-
"TRAVIS" not in os.environ, reason="Bazaar is only required under Travis"
16+
sys.platform == "win32" or "CI" not in os.environ,
17+
reason="Bazaar is only required under CI",
1618
)
1719
def test_ensure_bzr_available():
18-
"""Make sure that bzr is available when running in Travis."""
20+
"""Make sure that bzr is available when running in CI."""
1921
assert is_bzr_installed()
2022

2123

‎tests/unit/test_vcs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818

1919
@pytest.mark.skipif(
20-
"TRAVIS" not in os.environ, reason="Subversion is only required under Travis"
20+
"CI" not in os.environ, reason="Subversion is only required under CI"
2121
)
2222
def test_ensure_svn_available():
23-
"""Make sure that svn is available when running in Travis."""
23+
"""Make sure that svn is available when running in CI."""
2424
assert is_svn_installed()
2525

2626

0 commit comments

Comments
 (0)