Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update references from master to main #6795

Merged
merged 4 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ github:
features:
issues: true
protected_branches:
master:
main:
required_status_checks:
# require branches to be up-to-date before merging
strict: true
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: master
target-branch: main
labels: [ auto-dependencies, arrow ]
- package-ecosystem: cargo
directory: "/object_store"
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: master
target-branch: main
labels: [ auto-dependencies, object_store ]
- package-ecosystem: "github-actions"
directory: "/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
The CI is structured so most tests are run in specific workflows:
`arrow.yml` for `arrow`, `parquet.yml` for `parquet` and so on.

The basic idea is to run all tests on pushes to master (to ensure we
keep master green) but run only the individual workflows on PRs that
The basic idea is to run all tests on pushes to main (to ensure we
keep main green) but run only the individual workflows on PRs that
change files that could affect them.
2 changes: 1 addition & 1 deletion .github/workflows/arrow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
# always trigger
push:
branches:
- master
- main
pull_request:
paths:
- .github/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/arrow_flight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- arrow-array/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- '**/Cargo.toml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs and changes to master
# trigger for all PRs and changes to main
on:
push:
branches:
- master
- main
pull_request:

env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs and changes to master
# trigger for all PRs and changes to main
on:
push:
branches:
- master
- main
pull_request:

jobs:
Expand Down Expand Up @@ -70,8 +70,8 @@ jobs:
path: target/doc

deploy:
# Only deploy if a push to master
if: github.ref_name == 'master' && github.event_name == 'push'
# Only deploy if a push to main
if: github.ref_name == 'main' && github.event_name == 'push'
needs: docs
permissions:
contents: write
Expand All @@ -90,7 +90,7 @@ jobs:
cp .asf.yaml ./website/build/.asf.yaml
- name: Deploy to gh-pages
uses: peaceiris/[email protected]
if: github.event_name == 'push' && github.ref_name == 'master'
if: github.event_name == 'push' && github.ref_name == 'main'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: website/build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- .github/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/miri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- .github/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/object_store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- object_store/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- arrow/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/parquet_derive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs that touch certain files and changes to master
# trigger for all PRs that touch certain files and changes to main
on:
push:
branches:
- master
- main
pull_request:
paths:
- parquet/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

# trigger for all PRs and changes to master
# trigger for all PRs and changes to main
on:
push:
branches:
- master
- main
pull_request:

jobs:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ cargo test
cargo test -p arrow
```

For some changes, you may want to run additional tests. You can find up-to-date information on the current CI tests in [.github/workflows](https://github.com/apache/arrow-rs/tree/master/.github/workflows). Here are some examples of additional tests you may want to run:
For some changes, you may want to run additional tests. You can find up-to-date information on the current CI tests in [.github/workflows](https://github.com/apache/arrow-rs/tree/main/.github/workflows). Here are some examples of additional tests you may want to run:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old (master) urls still work too, but I think it is cleaner to simply update them all


```bash
# run tests for the parquet crate
Expand Down Expand Up @@ -217,13 +217,13 @@ cargo bench -p arrow-cast --bench parse_time
To set the baseline for your benchmarks, use the --save-baseline flag:

```bash
git checkout master
git checkout main

cargo bench --bench parse_time -- --save-baseline master
cargo bench --bench parse_time -- --save-baseline main

git checkout feature

cargo bench --bench parse_time -- --baseline master
cargo bench --bench parse_time -- --baseline main
```

## Git Pre-Commit Hook
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

# Native Rust implementation of Apache Arrow and Apache Parquet

[![Coverage Status](https://codecov.io/gh/apache/arrow-rs/rust/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/arrow-rs?branch=master)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't run the coverage job anymore, so let's not feature an out of date result prominently:


Welcome to the [Rust][rust] implementation of [Apache Arrow], the popular in-memory columnar format.

This repo contains the following main components:
Expand Down Expand Up @@ -58,7 +56,7 @@ breaking API changes) at most once a quarter, and release incremental minor
versions in the intervening months. See [this ticket] for more details.

To keep our maintenance burden down, we do regularly scheduled releases (major
and minor) from the `master` branch. How we handle PRs with breaking API changes
and minor) from the `main` branch. How we handle PRs with breaking API changes
is described in the [contributing] guide.

[contributing]: CONTRIBUTING.md#breaking-changes
Expand Down
2 changes: 1 addition & 1 deletion arrow-flight/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Apache Arrow Flight is a gRPC based protocol for exchanging Arrow data between p

This crate provides a Rust implementation of the
[Flight.proto](../format/Flight.proto) gRPC protocol and
[examples](https://github.com/apache/arrow-rs/tree/master/arrow-flight/examples)
[examples](https://github.com/apache/arrow-rs/tree/main/arrow-flight/examples)
that demonstrate how to build a Flight server implemented with [tonic](https://docs.rs/crate/tonic/latest).

## Feature Flags
Expand Down
2 changes: 1 addition & 1 deletion arrow-integration-testing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pip install -e dev/archery[integration]

### Build the C++ binaries:

Follow the [C++ Direction](https://github.com/apache/arrow/tree/master/docs/source/developers/cpp) and build the integration test binaries with a command like this:
Follow the [C++ Direction](https://github.com/apache/arrow/tree/main/docs/source/developers/cpp) and build the integration test binaries with a command like this:

```
# build cpp binaries
Expand Down
4 changes: 2 additions & 2 deletions arrow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
This crate contains the official Native Rust implementation of [Apache Arrow][arrow] in memory format, governed by the Apache Software Foundation.

The [API documentation](https://docs.rs/arrow/latest) contains examples and full API.
There are several [examples](https://github.com/apache/arrow-rs/tree/master/arrow/examples) to start from as well.
There are several [examples](https://github.com/apache/arrow-rs/tree/main/arrow/examples) to start from as well.

The API documentation for most recent, unreleased code is available [here](https://arrow.apache.org/rust/arrow/index.html).

Expand Down Expand Up @@ -57,7 +57,7 @@ The `arrow` crate provides the following features which may be enabled in your `
- `ipc` (default) - support for reading [Arrow IPC Format](https://arrow.apache.org/docs/format/Columnar.html#serialization-and-interprocess-communication-ipc), also used as the wire protocol in [arrow-flight](https://crates.io/crates/arrow-flight)
- `ipc_compression` - Enables reading and writing compressed IPC streams (also enables `ipc`)
- `prettyprint` - support for formatting record batches as textual columns
implementations of some [compute](https://github.com/apache/arrow-rs/tree/master/arrow/src/compute/kernels)
implementations of some [compute](https://github.com/apache/arrow-rs/tree/main/arrow/src/compute/kernels)
- `chrono-tz` - support of parsing timezone using [chrono-tz](https://docs.rs/chrono-tz/0.6.0/chrono_tz/)
- `ffi` - bindings for the Arrow C [C Data Interface](https://arrow.apache.org/docs/format/CDataInterface.html)
- `pyarrow` - bindings for pyo3 to call arrow-rs from python
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
//!
//! If you think you have found an instance where this is possible, please file
//! a ticket in our [issue tracker] and it will be triaged and fixed. For more information on
//! arrow's use of unsafe, see [here](https://github.com/apache/arrow-rs/tree/master/arrow#safety).
//! arrow's use of unsafe, see [here](https://github.com/apache/arrow-rs/tree/main/arrow#safety).
//!
//! # Higher-level Processing
//!
Expand Down
12 changes: 6 additions & 6 deletions dev/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This file documents the release process for the "Rust Arrow Crates": `arrow`, `a

The Rust Arrow Crates are interconnected (e.g. `parquet` has an optional dependency on `arrow`) so we increment and release all of them together.

If any code has been merged to master that has a breaking API change, as defined
If any code has been merged to main that has a breaking API change, as defined
in [Rust RFC 1105] he major version number is incremented (e.g. `9.0.2` to `10.0.2`).
Otherwise the new minor version incremented (e.g. `9.0.2` to `9.1.0`).

Expand All @@ -46,19 +46,19 @@ crates.io, the Rust ecosystem's package manager.
We create a `CHANGELOG.md` so our users know what has been changed between releases.

The CHANGELOG is created automatically using
[update_change_log.sh](https://github.com/apache/arrow-rs/blob/master/dev/release/update_change_log.sh)
[update_change_log.sh](https://github.com/apache/arrow-rs/blob/main/dev/release/update_change_log.sh)

This script creates a changelog using github issues and the
labels associated with them.

## Prepare CHANGELOG and version:

Now prepare a PR to update `CHANGELOG.md` and versions on `master` to reflect the planned release.
Now prepare a PR to update `CHANGELOG.md` and versions on `main` to reflect the planned release.

Do this in the root of this repository. For example [#2323](https://github.com/apache/arrow-rs/pull/2323)

```bash
git checkout master
git checkout main
git pull
git checkout -b <RELEASE_BRANCH>

Expand Down Expand Up @@ -96,7 +96,7 @@ Note that when reviewing the change log, rather than editing the
`CHANGELOG.md`, it is preferred to update the issues and their labels
(e.g. add `invalid` label to exclude them from release notes)

Merge this PR to `master` prior to the next step.
Merge this PR to `main` prior to the next step.

## Prepare release candidate tarball

Expand All @@ -115,7 +115,7 @@ Create and push the tag thusly:

```shell
git fetch apache
git tag <version> apache/master
git tag <version> apache/main
# push tag to apache
git push apache <version>
```
Expand Down
2 changes: 1 addition & 1 deletion dev/release/create-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ The vote will be open for at least 72 hours.
[1]: https://github.com/apache/arrow-rs/tree/${release_hash}
[2]: ${url}
[3]: https://github.com/apache/arrow-rs/blob/${release_hash}/CHANGELOG.md
[4]: https://github.com/apache/arrow-rs/blob/master/dev/release/verify-release-candidate.sh
[4]: https://github.com/apache/arrow-rs/blob/main/dev/release/verify-release-candidate.sh
MAIL
echo "---------------------------------------------------------"

Expand Down
2 changes: 1 addition & 1 deletion object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ license = "MIT/Apache-2.0"
readme = "README.md"
description = "A generic object store interface for uniformly interacting with AWS S3, Google Cloud Storage, Azure Blob Storage and local files."
keywords = ["object", "storage", "cloud"]
repository = "https://github.com/apache/arrow-rs/tree/master/object_store"
repository = "https://github.com/apache/arrow-rs/tree/main/object_store"
rust-version = "1.64.0"

[package.metadata.docs.rs]
Expand Down
Loading
Loading