Skip to content

Commit 92dc85a

Browse files
Backport PR pandas-dev#45336: CI/DOC: replace master -> main branch (pandas-dev#45338)
Co-authored-by: Joris Van den Bossche <[email protected]>
1 parent 8113813 commit 92dc85a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+99
-99
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this bug exists on the master branch of pandas.
20+
I have confirmed this bug exists on the main branch of pandas.
2121
- type: textarea
2222
id: example
2323
attributes:

.github/ISSUE_TEMPLATE/documentation_improvement.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
options:
1111
- label: >
1212
I have checked that the issue still exists on the latest versions of the docs
13-
on `master` [here](https://pandas.pydata.org/docs/dev/)
13+
on `main` [here](https://pandas.pydata.org/docs/dev/)
1414
required: true
1515
- type: textarea
1616
id: location

.github/ISSUE_TEMPLATE/performance_issue.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this issue exists on the master branch of pandas.
20+
I have confirmed this issue exists on the main branch of pandas.
2121
- type: textarea
2222
id: example
2323
attributes:

.github/workflows/asv-bot.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
git remote add upstream https://github.com/pandas-dev/pandas.git
6060
git fetch upstream
6161
asv machine --yes
62-
asv continuous -f 1.1 -b $REGEX upstream/master HEAD
62+
asv continuous -f 1.1 -b $REGEX upstream/main HEAD
6363
echo 'BENCH_OUTPUT<<EOF' >> $GITHUB_ENV
64-
asv compare -f 1.1 upstream/master HEAD >> $GITHUB_ENV
64+
asv compare -f 1.1 upstream/main HEAD >> $GITHUB_ENV
6565
echo 'EOF' >> $GITHUB_ENV
6666
echo "REGEX=$REGEX" >> $GITHUB_ENV
6767

.github/workflows/code-checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Code Checks
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212

1313
env:

.github/workflows/comment_bot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install-pre-commit
3030
run: python -m pip install --upgrade pre-commit
3131
- name: Run pre-commit
32-
run: pre-commit run --from-ref=origin/master --to-ref=HEAD --all-files || (exit 0)
32+
run: pre-commit run --from-ref=origin/main --to-ref=HEAD --all-files || (exit 0)
3333
- name: Commit results
3434
run: |
3535
git config user.name "$(git log -1 --pretty=format:%an)"

.github/workflows/datamanger.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Data Manager
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212

1313
env:

.github/workflows/docbuild-and-upload.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Doc Build and Upload
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212

1313
env:
@@ -53,18 +53,18 @@ jobs:
5353
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
5454
chmod 600 ~/.ssh/id_rsa
5555
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
56-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
56+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
5757

5858
- name: Copy cheatsheets into site directory
5959
run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/
6060

6161
- name: Upload web
6262
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
63-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
63+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
6464

6565
- name: Upload dev docs
6666
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
67-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
67+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
6868

6969
- name: Move docs into site directory
7070
run: mv doc/build/html web/build/docs

.github/workflows/posix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Posix
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212
paths-ignore:
1313
- "doc/**"

.github/workflows/python-dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Python Dev
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212
paths-ignore:
1313
- "doc/**"

.github/workflows/sdist.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: sdist
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212
paths-ignore:
1313
- "doc/**"

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN mkdir "$pandas_home" \
2828
&& git clone "https://github.com/$gh_username/pandas.git" "$pandas_home" \
2929
&& cd "$pandas_home" \
3030
&& git remote add upstream "https://github.com/pandas-dev/pandas.git" \
31-
&& git pull upstream master
31+
&& git pull upstream main
3232

3333
# Because it is surprisingly difficult to activate a conda environment inside a DockerFile
3434
# (from personal experience and per https://github.com/ContinuumIO/docker-images/issues/89),

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: clean_pyc
1212
python setup.py build_ext
1313

1414
lint-diff:
15-
git diff upstream/master --name-only -- "*.py" | xargs flake8
15+
git diff upstream/main --name-only -- "*.py" | xargs flake8
1616

1717
black:
1818
black .

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
[![Conda Latest Release](https://anaconda.org/conda-forge/pandas/badges/version.svg)](https://anaconda.org/anaconda/pandas/)
1010
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3509134.svg)](https://doi.org/10.5281/zenodo.3509134)
1111
[![Package Status](https://img.shields.io/pypi/status/pandas.svg)](https://pypi.org/project/pandas/)
12-
[![License](https://img.shields.io/pypi/l/pandas.svg)](https://github.com/pandas-dev/pandas/blob/master/LICENSE)
13-
[![Azure Build Status](https://dev.azure.com/pandas-dev/pandas/_apis/build/status/pandas-dev.pandas?branch=master)](https://dev.azure.com/pandas-dev/pandas/_build/latest?definitionId=1&branch=master)
14-
[![Coverage](https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master)](https://codecov.io/gh/pandas-dev/pandas)
12+
[![License](https://img.shields.io/pypi/l/pandas.svg)](https://github.com/pandas-dev/pandas/blob/main/LICENSE)
13+
[![Azure Build Status](https://dev.azure.com/pandas-dev/pandas/_apis/build/status/pandas-dev.pandas?branch=main)](https://dev.azure.com/pandas-dev/pandas/_build/latest?definitionId=1&branch=main)
14+
[![Coverage](https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=main)](https://codecov.io/gh/pandas-dev/pandas)
1515
[![Downloads](https://static.pepy.tech/personalized-badge/pandas?period=month&units=international_system&left_color=black&right_color=orange&left_text=PyPI%20downloads%20per%20month)](https://pepy.tech/project/pandas)
1616
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pydata/pandas)
1717
[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org)
@@ -170,4 +170,4 @@ Or maybe through using pandas you have an idea of your own or are looking for so
170170

171171
Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas).
172172

173-
As contributors and maintainers to this project, you are expected to abide by pandas' code of conduct. More information can be found at: [Contributor Code of Conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md)
173+
As contributors and maintainers to this project, you are expected to abide by pandas' code of conduct. More information can be found at: [Contributor Code of Conduct](https://github.com/pandas-dev/pandas/blob/main/.github/CODE_OF_CONDUCT.md)

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
trigger:
33
branches:
44
include:
5-
- master
5+
- main
66
- 1.4.x
77
paths:
88
exclude:
@@ -12,7 +12,7 @@ pr:
1212
autoCancel: true
1313
branches:
1414
include:
15-
- master
15+
- main
1616
- 1.4.x
1717

1818
variables:

codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
codecov:
2-
branch: master
2+
branch: main
33
notify:
44
after_n_builds: 10
55
comment: false

doc/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ def linkcode_resolve(domain, info):
651651
fn = os.path.relpath(fn, start=os.path.dirname(pandas.__file__))
652652

653653
if "+" in pandas.__version__:
654-
return f"https://github.com/pandas-dev/pandas/blob/master/pandas/{fn}{linespec}"
654+
return f"https://github.com/pandas-dev/pandas/blob/main/pandas/{fn}{linespec}"
655655
else:
656656
return (
657657
f"https://github.com/pandas-dev/pandas/blob/"

doc/source/development/contributing.rst

+17-17
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ will allow others to reproduce the bug and provide insight into fixing. See
5959
`this blogpost <https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports>`_
6060
for tips on writing a good bug report.
6161

62-
Trying the bug-producing code out on the *master* branch is often a worthwhile exercise
62+
Trying the bug-producing code out on the *main* branch is often a worthwhile exercise
6363
to confirm the bug still exists. It is also worth searching existing bug reports and pull requests
6464
to see if the issue has already been reported and/or fixed.
6565

@@ -143,7 +143,7 @@ as the version number cannot be computed anymore.
143143
Creating a branch
144144
-----------------
145145

146-
You want your master branch to reflect only production-ready code, so create a
146+
You want your main branch to reflect only production-ready code, so create a
147147
feature branch for making your changes. For example::
148148

149149
git branch shiny-new-feature
@@ -158,14 +158,14 @@ changes in this branch specific to one bug or feature so it is clear
158158
what the branch brings to pandas. You can have many shiny-new-features
159159
and switch in between them using the git checkout command.
160160

161-
When creating this branch, make sure your master branch is up to date with
162-
the latest upstream master version. To update your local master branch, you
161+
When creating this branch, make sure your main branch is up to date with
162+
the latest upstream main version. To update your local main branch, you
163163
can do::
164164

165-
git checkout master
166-
git pull upstream master --ff-only
165+
git checkout main
166+
git pull upstream main --ff-only
167167

168-
When you want to update the feature branch with changes in master after
168+
When you want to update the feature branch with changes in main after
169169
you created the branch, check the section on
170170
:ref:`updating a PR <contributing.update-pr>`.
171171

@@ -256,16 +256,16 @@ double check your branch changes against the branch it was based on:
256256
#. Navigate to your repository on GitHub -- https://github.com/your-user-name/pandas
257257
#. Click on ``Branches``
258258
#. Click on the ``Compare`` button for your feature branch
259-
#. Select the ``base`` and ``compare`` branches, if necessary. This will be ``master`` and
259+
#. Select the ``base`` and ``compare`` branches, if necessary. This will be ``main`` and
260260
``shiny-new-feature``, respectively.
261261

262262
Finally, make the pull request
263263
------------------------------
264264

265265
If everything looks good, you are ready to make a pull request. A pull request is how
266266
code from a local repository becomes available to the GitHub community and can be looked
267-
at and eventually merged into the master version. This pull request and its associated
268-
changes will eventually be committed to the master branch and available in the next
267+
at and eventually merged into the main version. This pull request and its associated
268+
changes will eventually be committed to the main branch and available in the next
269269
release. To submit a pull request:
270270

271271
#. Navigate to your repository on GitHub
@@ -294,14 +294,14 @@ This will automatically update your pull request with the latest code and restar
294294
:any:`Continuous Integration <contributing.ci>` tests.
295295

296296
Another reason you might need to update your pull request is to solve conflicts
297-
with changes that have been merged into the master branch since you opened your
297+
with changes that have been merged into the main branch since you opened your
298298
pull request.
299299

300-
To do this, you need to "merge upstream master" in your branch::
300+
To do this, you need to "merge upstream main" in your branch::
301301

302302
git checkout shiny-new-feature
303303
git fetch upstream
304-
git merge upstream/master
304+
git merge upstream/main
305305

306306
If there are no conflicts (or they could be fixed automatically), a file with a
307307
default commit message will open, and you can simply save and quit this file.
@@ -313,7 +313,7 @@ Once the conflicts are merged and the files where the conflicts were solved are
313313
added, you can run ``git commit`` to save those fixes.
314314

315315
If you have uncommitted changes at the moment you want to update the branch with
316-
master, you will need to ``stash`` them prior to updating (see the
316+
main, you will need to ``stash`` them prior to updating (see the
317317
`stash docs <https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning>`__).
318318
This will effectively store your changes and they can be reapplied after updating.
319319

@@ -342,12 +342,12 @@ Delete your merged branch (optional)
342342
------------------------------------
343343

344344
Once your feature branch is accepted into upstream, you'll probably want to get rid of
345-
the branch. First, merge upstream master into your branch so git knows it is safe to
345+
the branch. First, merge upstream main into your branch so git knows it is safe to
346346
delete your branch::
347347

348348
git fetch upstream
349-
git checkout master
350-
git merge upstream/master
349+
git checkout main
350+
git merge upstream/main
351351

352352
Then you can do::
353353

0 commit comments

Comments
 (0)