Skip to content

Commit 6a0fb33

Browse files
andygroveandygrove
authored
replace master with main (apache#147)
1 parent 950a578 commit 6a0fb33

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ updates:
2525
interval: "weekly"
2626
day: "saturday"
2727
open-pull-requests-limit: 20
28-
target-branch: master
28+
target-branch: main
2929

3030
- package-ecosystem: "github-actions"
3131
directory: "/"
3232
schedule:
3333
interval: "weekly"
3434
day: "sunday"
3535
open-pull-requests-limit: 20
36-
target-branch: master
36+
target-branch: main

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
name: Python Release Build
1919
on:
2020
pull_request:
21-
branches: ["master"]
21+
branches: ["main"]
2222
push:
2323
tags: ["*-rc*"]
24-
branches: ["master"]
24+
branches: ["main"]
2525

2626
jobs:
2727
generate-license:

‎.github/workflows/docs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: target-branch
1717
run: |
1818
set -x
19-
if test '${{ github.ref }}' = 'refs/heads/master'; then
19+
if test '${{ github.ref }}' = 'refs/heads/main'; then
2020
echo "value=asf-staging" >> $GITHUB_OUTPUT
2121
elif test '${{ github.ref_type }}' = 'tag'; then
2222
echo "value=asf-site" >> $GITHUB_OUTPUT

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
name: Python test
1919
on:
2020
push:
21-
branches: [master]
21+
branches: [main]
2222
pull_request:
23-
branches: [master]
23+
branches: [main]
2424

2525
concurrency:
2626
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}

‎dev/release/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The version number in Cargo.toml should be increased, according to semver.
2525

2626
## Update CHANGELOG.md
2727

28-
Define release branch (e.g. `master`), base version tag (e.g. `0.6.0`) and future version tag (e.g. `0.7.0`). Commits
28+
Define release branch (e.g. `main`), base version tag (e.g. `0.6.0`) and future version tag (e.g. `0.7.0`). Commits
2929
between the base version tag and the release branch will be used to populate the changelog content.
3030

3131
You will need a GitHub Personal Access Token for the following steps. Follow
@@ -34,7 +34,7 @@ to generate one if you do not already have one.
3434

3535
```bash
3636
# create the changelog
37-
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-datafusion-python.sh master 0.7.0 0.6.0
37+
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-datafusion-python.sh main 0.7.0 0.6.0
3838
# review change log / edit issues and labels if needed, rerun until you are happy with the result
3939
git commit -a -m 'Create changelog for release'
4040
```
@@ -46,8 +46,8 @@ value of the `--cpus` argument in the `update_change_log.sh` script._
4646
You can add `invalid` or `development-process` label to exclude items from
4747
release notes.
4848

49-
Send a PR to get these changes merged into `master` branch. If new commits that
50-
could change the change log content landed in the `master` branch before you
49+
Send a PR to get these changes merged into `main` branch. If new commits that
50+
could change the change log content landed in the `main` branch before you
5151
could merge the PR, you need to rerun the changelog update script to regenerate
5252
the changelog and update the PR accordingly.
5353

@@ -87,7 +87,7 @@ on the release. The vote will be open for at least 72 hours.
8787
Only votes from PMC members are binding, but all members of the community are
8888
encouraged to test the release and vote with "(non-binding)".
8989
90-
The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/master/dev/release/README.md#verifying-release-candidates.
90+
The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/main/dev/release/README.md#verifying-release-candidates.
9191
9292
[ ] +1 Release this as Apache Arrow DataFusion Python 0.7.0
9393
[ ] +0
@@ -117,7 +117,7 @@ This section assumes some familiary with publishing Python packages to PyPi. For
117117

118118
#### Publish Python Wheels to testpypi
119119

120-
Pushing an `rc` tag to master will cause a GitHub Workflow to run that will build the Python wheels.
120+
Pushing an `rc` tag to main will cause a GitHub Workflow to run that will build the Python wheels.
121121

122122
Go to https://github.com/apache/arrow-datafusion-python/actions and look for an action named "Python Release Build"
123123
that has run against the pushed tag.

‎dev/release/create-tarball.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ on the release. The vote will be open for at least 72 hours.
9797
Only votes from PMC members are binding, but all members of the community are
9898
encouraged to test the release and vote with "(non-binding)".
9999
100-
The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/master/dev/release/README.md#verifying-release-candidates.
100+
The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/main/dev/release/README.md#verifying-release-candidates.
101101
102102
[ ] +1 Release this as Apache Arrow DataFusion Python ${version}
103103
[ ] +0

‎dev/release/update_change_log-datafusion-python.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020

2121
# Usage:
22-
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh master 8.0.0 7.1.0
22+
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh main 8.0.0 7.1.0
2323
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh maint-7.x 7.1.0 7.0.0
2424

2525
RELEASE_BRANCH=$1

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
html_context = {
9292
"github_user": "apache",
9393
"github_repo": "arrow-datafusion-python",
94-
"github_version": "master",
94+
"github_version": "main",
9595
"doc_path": "docs/source",
9696
}
9797

0 commit comments

Comments
 (0)