diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6674c395..4058e8a6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,7 +25,7 @@ updates: interval: "weekly" day: "saturday" open-pull-requests-limit: 20 - target-branch: master + target-branch: main - package-ecosystem: "github-actions" directory: "/" @@ -33,4 +33,4 @@ updates: interval: "weekly" day: "sunday" open-pull-requests-limit: 20 - target-branch: master + target-branch: main diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c56e4a9..01ef4a7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ name: Python Release Build on: pull_request: - branches: ["master"] + branches: ["main"] push: tags: ["*-rc*"] - branches: ["master"] + branches: ["main"] jobs: generate-license: diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 831eca7f..b1c9ffc1 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -16,7 +16,7 @@ jobs: id: target-branch run: | set -x - if test '${{ github.ref }}' = 'refs/heads/master'; then + if test '${{ github.ref }}' = 'refs/heads/main'; then echo "value=asf-staging" >> $GITHUB_OUTPUT elif test '${{ github.ref_type }}' = 'tag'; then echo "value=asf-site" >> $GITHUB_OUTPUT diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ffa98325..5ca3cd44 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -18,9 +18,9 @@ name: Python test on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} diff --git a/dev/release/README.md b/dev/release/README.md index 00eb8bb9..aa2a10e3 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -25,7 +25,7 @@ The version number in Cargo.toml should be increased, according to semver. ## Update CHANGELOG.md -Define release branch (e.g. `master`), base version tag (e.g. `0.6.0`) and future version tag (e.g. `0.7.0`). Commits +Define release branch (e.g. `main`), base version tag (e.g. `0.6.0`) and future version tag (e.g. `0.7.0`). Commits between the base version tag and the release branch will be used to populate the changelog content. 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. ```bash # create the changelog -CHANGELOG_GITHUB_TOKEN= ./dev/release/update_change_log-datafusion-python.sh master 0.7.0 0.6.0 +CHANGELOG_GITHUB_TOKEN= ./dev/release/update_change_log-datafusion-python.sh main 0.7.0 0.6.0 # review change log / edit issues and labels if needed, rerun until you are happy with the result git commit -a -m 'Create changelog for release' ``` @@ -46,8 +46,8 @@ value of the `--cpus` argument in the `update_change_log.sh` script._ You can add `invalid` or `development-process` label to exclude items from release notes. -Send a PR to get these changes merged into `master` branch. If new commits that -could change the change log content landed in the `master` branch before you +Send a PR to get these changes merged into `main` branch. If new commits that +could change the change log content landed in the `main` branch before you could merge the PR, you need to rerun the changelog update script to regenerate the changelog and update the PR accordingly. @@ -87,7 +87,7 @@ on the release. The vote will be open for at least 72 hours. Only votes from PMC members are binding, but all members of the community are encouraged to test the release and vote with "(non-binding)". -The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/master/dev/release/README.md#verifying-release-candidates. +The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/main/dev/release/README.md#verifying-release-candidates. [ ] +1 Release this as Apache Arrow DataFusion Python 0.7.0 [ ] +0 @@ -117,7 +117,7 @@ This section assumes some familiary with publishing Python packages to PyPi. For #### Publish Python Wheels to testpypi -Pushing an `rc` tag to master will cause a GitHub Workflow to run that will build the Python wheels. +Pushing an `rc` tag to main will cause a GitHub Workflow to run that will build the Python wheels. Go to https://github.com/apache/arrow-datafusion-python/actions and look for an action named "Python Release Build" that has run against the pushed tag. diff --git a/dev/release/create-tarball.sh b/dev/release/create-tarball.sh index 1a5bd068..c05da5b7 100755 --- a/dev/release/create-tarball.sh +++ b/dev/release/create-tarball.sh @@ -97,7 +97,7 @@ on the release. The vote will be open for at least 72 hours. Only votes from PMC members are binding, but all members of the community are encouraged to test the release and vote with "(non-binding)". -The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/master/dev/release/README.md#verifying-release-candidates. +The standard verification procedure is documented at https://github.com/apache/arrow-datafusion-python/blob/main/dev/release/README.md#verifying-release-candidates. [ ] +1 Release this as Apache Arrow DataFusion Python ${version} [ ] +0 diff --git a/dev/release/update_change_log-datafusion-python.sh b/dev/release/update_change_log-datafusion-python.sh index d993536f..a11447f0 100755 --- a/dev/release/update_change_log-datafusion-python.sh +++ b/dev/release/update_change_log-datafusion-python.sh @@ -19,7 +19,7 @@ # # Usage: -# CHANGELOG_GITHUB_TOKEN= ./update_change_log-datafusion.sh master 8.0.0 7.1.0 +# CHANGELOG_GITHUB_TOKEN= ./update_change_log-datafusion.sh main 8.0.0 7.1.0 # CHANGELOG_GITHUB_TOKEN= ./update_change_log-datafusion.sh maint-7.x 7.1.0 7.0.0 RELEASE_BRANCH=$1 diff --git a/docs/source/conf.py b/docs/source/conf.py index ce3d3c7e..929c2493 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -91,7 +91,7 @@ html_context = { "github_user": "apache", "github_repo": "arrow-datafusion-python", - "github_version": "master", + "github_version": "main", "doc_path": "docs/source", }