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.

Sign up for GitHub

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

Jump to bottom

Prepare for 7.x release: Update version to 7.1.0, add ChangeLog #2187

Merged
merged 5 commits into from
Apr 10, 2022
Merged

Prepare for 7.x release: Update version to 7.1.0, add ChangeLog #2187

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebf2dd7
Update version
jychen7 Apr 9, 2022
665a7b2
modify script to respect release branch
jychen7 Apr 9, 2022
8014947
Create changelog for release
jychen7 Apr 10, 2022
6d84c51
manually fix changelog
jychen7 Apr 10, 2022
9d6cf56
Apply suggestions from code review
jychen7 Apr 10, 2022
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 ballista/rust/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tempfile = "3"
sqlparser = "0.14"
parking_lot = "0.12"

datafusion = { path = "../../../datafusion", version = "7.0.0" }
datafusion = { path = "../../../datafusion", version = "7.1.0" }

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion ballista/rust/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ clap = { version = "3", features = ["derive", "cargo"] }
parse_arg = "0.1.3"

arrow-flight = { version = "9.0.0" }
datafusion = { path = "../../../datafusion", version = "7.0.0" }
datafusion = { path = "../../../datafusion", version = "7.1.0" }

parking_lot = "0.12"

Expand Down
2 changes: 1 addition & 1 deletion ballista/rust/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ anyhow = "1"
async-trait = "0.1.36"
ballista-core = { path = "../core", version = "0.6.0" }
configure_me = "0.4.0"
datafusion = { path = "../../../datafusion", version = "7.0.0" }
datafusion = { path = "../../../datafusion", version = "7.1.0" }
env_logger = "0.9"
futures = "0.3"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion ballista/rust/scheduler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ anyhow = "1"
ballista-core = { path = "../core", version = "0.6.0" }
clap = { version = "3", features = ["derive", "cargo"] }
configure_me = "0.4.0"
datafusion = { path = "../../../datafusion", version = "7.0.0" }
datafusion = { path = "../../../datafusion", version = "7.1.0" }
env_logger = "0.9"
etcd-client = { version = "0.8", optional = true }
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion datafusion-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rust-version = "1.58"
clap = { version = "3", features = ["derive", "cargo"] }
rustyline = "9.0"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
datafusion = { path = "../datafusion", version = "7.0.0" }
datafusion = { path = "../datafusion", version = "7.1.0" }
arrow = { version = "9.0.0" }
ballista = { path = "../ballista/rust/client", version = "0.6.0" }
env_logger = "0.9"
jychen7 marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 8 additions & 0 deletions datafusion/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@

# Changelog

## [7.1.0](https://github.com/apache/arrow-datafusion/tree/7.1.0) (2022-04-10)

[Full Changelog](https://github.com/apache/arrow-datafusion/compare/7.0.0...7.1.0)

**Fixed bugs:**

- By default, use only 1000 rows to infer the schema [\#2159](https://github.com/apache/arrow-datafusion/pull/2159)
Copy link
Contributor

Choose a reason for hiding this comment

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

👍


## [7.0.0](https://github.com/apache/arrow-datafusion/tree/7.0.0) (2022-02-14)

[Full Changelog](https://github.com/apache/arrow-datafusion/compare/6.0.0...7.0.0)
Expand Down
2 changes: 1 addition & 1 deletion datafusion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "datafusion"
description = "DataFusion is an in-memory query engine that uses Apache Arrow as the memory model"
version = "7.0.0"
version = "7.1.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "../README.md"
Expand Down
6 changes: 2 additions & 4 deletions dev/release/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,12 @@ git commit -a -m 'Update version'

### Update CHANGELOG.md

Manully edit the base version tag argument in
`dev/release/update_change_log-{ballista,datafusion,python}.sh`. Commits
between the base verstion tag and the latest upstream master will be used to
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 verstion tag and the release branch will be used to
populate the changelog content.

```bash
# create the changelog
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-all.sh
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-all.sh master 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'
```
Expand Down
7 changes: 4 additions & 3 deletions dev/release/update_change_log-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
set -e

# Usage:
jychen7 marked this conversation as resolved.
Show resolved Hide resolved
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-all.sh master 8.0.0 7.1.0
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-all.sh maint-7.x 7.1.0 7.0.0

SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"

${SOURCE_DIR}/update_change_log-datafusion.sh
${SOURCE_DIR}/update_change_log-ballista.sh
${SOURCE_DIR}/update_change_log-datafusion.sh $1 $2 $3
${SOURCE_DIR}/update_change_log-ballista.sh $1 $2 $3
14 changes: 8 additions & 6 deletions dev/release/update_change_log-ballista.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@
#

# Usage:
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh master ballista-0.7.0 ballista-0.6.0

SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
RELEASE_BRANCH=$1
RELEASE_TAG=$2
BASE_TAG=$3

CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/ballista/rust/client/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
${SOURCE_DIR}/update_change_log.sh \
ballista \
ballista-0.5.0 \
"${BASE_TAG}" \
--exclude-tags-regex "python-.+" \
--future-release "ballista-${CURRENT_VER}"
--future-release "${RELEASE_TAG}" \
--release-branch "${RELEASE_BRANCH}"
15 changes: 9 additions & 6 deletions dev/release/update_change_log-datafusion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@
#

# Usage:
# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh
# 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 maint-7.x 7.1.0 7.0.0

SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
RELEASE_BRANCH=$1
RELEASE_TAG=$2
BASE_TAG=$3

CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/datafusion/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
${SOURCE_DIR}/update_change_log.sh \
datafusion \
5.0.0 \
"${BASE_TAG}" \
--exclude-tags-regex "(python|ballista)-.+" \
--future-release "${CURRENT_VER}"
--future-release "${RELEASE_TAG}" \
--release-branch "${RELEASE_BRANCH}"