This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new a10f3a019 Rename master to main (#5280)
a10f3a019 is described below
commit a10f3a0191953ee801b3dcc2cf9b0accdbedcbbe
Author: Andy Grove <[email protected]>
AuthorDate: Thu Feb 16 04:23:20 2023 -0700
Rename master to main (#5280)
---
.github/dependabot.yml | 2 +-
datafusion/core/src/lib.rs | 2 +-
datafusion/row/README.md | 2 +-
datafusion/substrait/README.md | 2 +-
dev/release/README.md | 24 ++++++++++++------------
dev/release/create-tarball.sh | 2 +-
dev/release/update_change_log-datafusion.sh | 2 +-
docs/build.sh | 2 +-
docs/source/conf.py | 2 +-
docs/source/contributor-guide/roadmap.md | 2 +-
docs/source/index.rst | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d7da9d8d5..a5d36ce96 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,7 +22,7 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 10
- target-branch: master
+ target-branch: main
labels: [auto-dependencies]
- package-ecosystem: "github-actions"
directory: "/"
diff --git a/datafusion/core/src/lib.rs b/datafusion/core/src/lib.rs
index d227b1cc8..bb8c8ff09 100644
--- a/datafusion/core/src/lib.rs
+++ b/datafusion/core/src/lib.rs
@@ -184,7 +184,7 @@
//!
//! ## Examples
//!
-//! Examples are located in [datafusion-examples
directory](https://github.com/apache/arrow-datafusion/tree/master/datafusion-examples)
+//! Examples are located in [datafusion-examples
directory](https://github.com/apache/arrow-datafusion/tree/main/datafusion-examples)
//!
//! Here's how to run them
//!
diff --git a/datafusion/row/README.md b/datafusion/row/README.md
index 4952d1fdc..eef4dfd55 100644
--- a/datafusion/row/README.md
+++ b/datafusion/row/README.md
@@ -26,4 +26,4 @@ This crate is a submodule of DataFusion that provides an
optimized row based for
See the documentation in [`lib.rs`] for more details.
[df]: https://crates.io/crates/datafusion
-[`lib.rs`]:
https://github.com/apache/arrow-datafusion/blob/master/datafusion/row/src/lib.rs
+[`lib.rs`]:
https://github.com/apache/arrow-datafusion/blob/main/datafusion/row/src/lib.rs
diff --git a/datafusion/substrait/README.md b/datafusion/substrait/README.md
index 5275b6177..17591cdd6 100644
--- a/datafusion/substrait/README.md
+++ b/datafusion/substrait/README.md
@@ -29,6 +29,6 @@ This repository provides a Substrait producer and consumer
for DataFusion:
Potential uses of this crate:
-- Replace the current [DataFusion protobuf
definition](https://github.com/apache/arrow-datafusion/blob/master/datafusion/proto/proto/datafusion.proto)
used in Ballista for passing query plan fragments to executors
+- Replace the current [DataFusion protobuf
definition](https://github.com/apache/arrow-datafusion/blob/main/datafusion/proto/proto/datafusion.proto)
used in Ballista for passing query plan fragments to executors
- Make it easier to pass query plans over FFI boundaries, such as from Python
to Rust
- Allow Apache Calcite query plans to be executed in DataFusion
diff --git a/dev/release/README.md b/dev/release/README.md
index 3dbeea9dc..92dc7e5bb 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -26,7 +26,7 @@ Patch releases are made on an adhoc basis, but we try and
avoid them given the f
## Branching Policy
- When we prepare a new release, we create a release branch, such as
`branch-18` in the Apache repository (not in a fork)
-- We update the crate version and generate the changelog in this branch and
create a PR against the master branch
+- We update the crate version and generate the changelog in this branch and
create a PR against the main branch
- Once the PR is approved and merged, we tag the rc in the release branch, and
release from the release branch
- Bug fixes can be merged to the release branch and patch releases can be
created from the release branch
@@ -34,8 +34,8 @@ Patch releases are made on an adhoc basis, but we try and
avoid them given the f
If you would like to propose your change for inclusion in a release branch
-1. follow normal workflow to create PR to `master` branch and wait for its
approval and merges.
-2. after PR is squash merged to `master`, branch from most recent release
branch (e.g. `branch-18`), cherry-pick the commit and create a PR to release
branch.
+1. follow normal workflow to create PR to `main` branch and wait for its
approval and merges.
+2. after PR is squash merged to `main`, branch from most recent release branch
(e.g. `branch-18`), cherry-pick the commit and create a PR to release branch.
## Prerequisite
@@ -80,7 +80,7 @@ We maintain a `CHANGELOG.md` so our users know what has been
changed between releases.
The CHANGELOG is managed automatically using
-[update_change_log.sh](https://github.com/apache/arrow-datafusion/blob/master/dev/release/update_change_log.sh)
+[update_change_log.sh](https://github.com/apache/arrow-datafusion/blob/main/dev/release/update_change_log.sh)
This script creates a changelog using GitHub PRs and issues based on the labels
associated with them.
@@ -96,11 +96,11 @@ Here are the commands that could be used to prepare the
`5.1.0` release:
### Update Version
-Checkout the master commit to be released
+Checkout the main commit to be released
```
git fetch apache
-git checkout apache/master
+git checkout apache/main
```
Update datafusion version in `datafusion/Cargo.toml` to `5.1.0`:
@@ -117,7 +117,7 @@ git commit -a -m 'Update version'
### Update CHANGELOG.md
-Define release branch (e.g. `master`), base version tag (e.g. `7.0.0`) and
future version tag (e.g. `8.0.0`). Commits between the base version tag and the
release branch will be used to
+Define release branch (e.g. `main`), base version tag (e.g. `7.0.0`) and
future version tag (e.g. `8.0.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
@@ -126,7 +126,7 @@ to generate one if you do not already have one.
```bash
# create the changelog
-CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-datafusion.sh
master 8.0.0 7.0.0
+CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-datafusion.sh
main 8.0.0 7.0.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'
```
@@ -138,8 +138,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.
@@ -163,7 +163,7 @@ Using a string such as `5.1.0` as the `<version>`, create
and push the tag by ru
```shell
git fetch apache
-git tag <version>-<rc> apache/master
+git tag <version>-<rc> apache/main
# push tag to Github remote
git push apache <version>
```
@@ -233,7 +233,7 @@ The `dev/release/verify-release-candidate.sh` is a script
in this repository tha
#### If the release is not approved
If the release is not approved, fix whatever the problem is, merge changelog
-changes into master if there is any and try again with the next RC number.
+changes into main if there is any and try again with the next RC number.
## Finalize the release
diff --git a/dev/release/create-tarball.sh b/dev/release/create-tarball.sh
index 563610bc7..f673466e3 100755
--- a/dev/release/create-tarball.sh
+++ b/dev/release/create-tarball.sh
@@ -96,7 +96,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/blob/master/dev/release/README.md#verifying-release-candidates.
+The standard verification procedure is documented at
https://github.com/apache/arrow-datafusion/blob/main/dev/release/README.md#verifying-release-candidates.
[ ] +1 Release this as Apache Arrow DataFusion ${version}
[ ] +0
diff --git a/dev/release/update_change_log-datafusion.sh
b/dev/release/update_change_log-datafusion.sh
index fb605857e..0c5a9144e 100755
--- a/dev/release/update_change_log-datafusion.sh
+++ b/dev/release/update_change_log-datafusion.sh
@@ -19,7 +19,7 @@
#
# Usage:
-# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh master
8.0.0 7.1.0
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh main 8.0.0
7.1.0
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh maint-7.x
7.1.0 7.0.0
RELEASE_BRANCH=$1
diff --git a/docs/build.sh b/docs/build.sh
index 1af99c3dc..914c9524a 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -24,5 +24,5 @@ rm -rf temp 2> /dev/null
mkdir temp
cp -rf source/* temp/
# replace relative URLs with absolute URLs
-sed -i
's/\.\.\/\.\.\/\.\.\//https:\/\/github.com\/apache\/arrow-datafusion\/blob\/master\//g'
temp/contributor-guide/index.md
+sed -i
's/\.\.\/\.\.\/\.\.\//https:\/\/github.com\/apache\/arrow-datafusion\/blob\/main\//g'
temp/contributor-guide/index.md
make SOURCEDIR=`pwd`/temp html
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0d507fcbd..29bae4b8a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -91,7 +91,7 @@ html_theme_options = {
html_context = {
"github_user": "apache",
"github_repo": "arrow-datafusion",
- "github_version": "master",
+ "github_version": "main",
"doc_path": "docs/source",
}
diff --git a/docs/source/contributor-guide/roadmap.md
b/docs/source/contributor-guide/roadmap.md
index 736eef681..8413fef20 100644
--- a/docs/source/contributor-guide/roadmap.md
+++ b/docs/source/contributor-guide/roadmap.md
@@ -50,7 +50,7 @@ to provide:
### Additional SQL Language Features
- Decimal Support [#122](https://github.com/apache/arrow-datafusion/issues/122)
-- Complete support list on
[status](https://github.com/apache/arrow-datafusion/blob/master/README.md#status)
+- Complete support list on
[status](https://github.com/apache/arrow-datafusion/blob/main/README.md#status)
- Timestamp Arithmetic
[#194](https://github.com/apache/arrow-datafusion/issues/194)
- SQL Parser extension point
[#533](https://github.com/apache/arrow-datafusion/issues/533)
- Support for nested structures (fields, lists, structs)
[#119](https://github.com/apache/arrow-datafusion/issues/119)
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 86b3b7e2c..57290d5a2 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -51,4 +51,4 @@ Table of Contents
contributor-guide/quarterly_roadmap
contributor-guide/specification/index
Issue tracker <https://github.com/apache/arrow-datafusion/issues>
- Code of conduct
<https://github.com/apache/arrow-datafusion/blob/master/CODE_OF_CONDUCT.md>
+ Code of conduct
<https://github.com/apache/arrow-datafusion/blob/main/CODE_OF_CONDUCT.md>
