Skip to content

Commit 2fc857a

Browse files
authored
Update CI files to account for the master -> main rename (pythonGH-25860)
1 parent bb3e0c2 commit 2fc857a

15 files changed

+1881
-2040
lines changed

.azure-pipelines/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
coverage: false
33

4-
trigger: ['master', '3.9', '3.8', '3.7']
4+
trigger: ['main', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild

.azure-pipelines/pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
coverage: false
33

4-
pr: ['master', '3.9', '3.8', '3.7']
4+
pr: ['main', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild

.github/CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contributing to Python
44
Build Status
55
------------
66

7-
- master
7+
- main
88

99
+ `Stable buildbots <http://buildbot.python.org/3.x.stable/>`_
1010

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Most PRs will require an issue number. Trivial changes, like fixing a typo, do n
1616
1717
# Backport Pull Request title
1818
19-
If this is a backport PR (PR made against branches other than `master`),
19+
If this is a backport PR (PR made against branches other than `main`),
2020
please ensure that the PR title is in the following format:
2121
2222
```
@@ -25,6 +25,6 @@ please ensure that the PR title is in the following format:
2525
2626
Where: [X.Y] is the branch name, e.g. [3.6].
2727
28-
GH-NNNN refers to the PR number from `master`.
28+
GH-NNNN refers to the PR number from `main`.
2929
3030
-->

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ name: Tests
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010
- 3.9
1111
- 3.8
1212
- 3.7
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616
- 3.9
1717
- 3.8
1818
- 3.7

.github/workflows/build_msi.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: TestsMSI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 3.9
88
- 3.8
99
- 3.7
1010
paths:
1111
- 'Tools/msi/**'
1212
pull_request:
1313
branches:
14-
- master
14+
- main
1515
- 3.9
1616
- 3.8
1717
- 3.7

.github/workflows/doc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Docs
33
on:
44
#push:
55
# branches:
6-
# - master
6+
# - main
77
# - 3.9
88
# - 3.8
99
# - 3.7
1010
# paths:
1111
# - 'Doc/**'
1212
pull_request:
1313
branches:
14-
- master
14+
- main
1515
- 3.9
1616
- 3.8
1717
- 3.7

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
branches:
2323
only:
24-
- master
24+
- main
2525
- /^\d\.\d+$/
2626
- buildbot-custom
2727

PC/pyconfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
268268
file in their Makefile (other compilers are
269269
generally taken care of by distutils.) */
270270
# if defined(_DEBUG)
271-
# pragma comment(lib,"python310_d.lib")
271+
# pragma comment(lib,"python311_d.lib")
272272
# elif defined(Py_LIMITED_API)
273273
# pragma comment(lib,"python3.lib")
274274
# else
275-
# pragma comment(lib,"python310.lib")
275+
# pragma comment(lib,"python311.lib")
276276
# endif /* _DEBUG */
277277
# endif /* _MSC_VER */
278278
# endif /* Py_BUILD_CORE */

README.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
This is Python version 3.11.0 alpha 1
22
=====================================
33

4-
.. image:: https://travis-ci.com/python/cpython.svg?branch=master
4+
.. image:: https://travis-ci.com/python/cpython.svg?branch=main
55
:alt: CPython build status on Travis CI
66
:target: https://travis-ci.com/python/cpython
77

88
.. image:: https://github.com/python/cpython/workflows/Tests/badge.svg
99
:alt: CPython build status on GitHub Actions
1010
:target: https://github.com/python/cpython/actions
1111

12-
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Azure%20Pipelines%20CI?branchName=master
12+
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Azure%20Pipelines%20CI?branchName=main
1313
:alt: CPython build status on Azure DevOps
14-
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=master
14+
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=main
1515

1616
.. image:: https://img.shields.io/badge/discourse-join_chat-brightgreen.svg
1717
:alt: Python Discourse chat
@@ -75,10 +75,10 @@ dependencies for various Linux distributions and macOS.
7575

7676
On macOS, there are additional configure and build options related
7777
to macOS framework and universal builds. Refer to `Mac/README.rst
78-
<https://github.com/python/cpython/blob/master/Mac/README.rst>`_.
78+
<https://github.com/python/cpython/blob/main/Mac/README.rst>`_.
7979

8080
On Windows, see `PCbuild/readme.txt
81-
<https://github.com/python/cpython/blob/master/PCbuild/readme.txt>`_.
81+
<https://github.com/python/cpython/blob/main/PCbuild/readme.txt>`_.
8282

8383
If you wish, you can create a subdirectory and invoke configure from there.
8484
For example::
@@ -139,9 +139,9 @@ What's New
139139
We have a comprehensive overview of the changes in the `What's New in Python
140140
3.10 <https://docs.python.org/3.10/whatsnew/3.10.html>`_ document. For a more
141141
detailed change log, read `Misc/NEWS
142-
<https://github.com/python/cpython/blob/master/Misc/NEWS.d>`_, but a full
142+
<https://github.com/python/cpython/blob/main/Misc/NEWS.d>`_, but a full
143143
accounting of changes can only be gleaned from the `commit history
144-
<https://github.com/python/cpython/commits/master>`_.
144+
<https://github.com/python/cpython/commits/main>`_.
145145

146146
If you want to install multiple versions of Python, see the section below
147147
entitled "Installing multiple versions".
@@ -159,7 +159,7 @@ is primarily for documentation authors, translators, and people with special
159159
formatting requirements.
160160

161161
For information about building Python's documentation, refer to `Doc/README.rst
162-
<https://github.com/python/cpython/blob/master/Doc/README.rst>`_.
162+
<https://github.com/python/cpython/blob/main/Doc/README.rst>`_.
163163

164164

165165
Converting From Python 2.x to 3.x
@@ -255,7 +255,7 @@ rights reserved.
255255

256256
Copyright (c) 1991-1995 Stichting Mathematisch Centrum. All rights reserved.
257257

258-
See the `LICENSE <https://github.com/python/cpython/blob/master/LICENSE>`_ for
258+
See the `LICENSE <https://github.com/python/cpython/blob/main/LICENSE>`_ for
259259
information on the history of this software, terms & conditions for usage, and a
260260
DISCLAIMER OF ALL WARRANTIES.
261261

0 commit comments

Comments
 (0)