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

fix(dev/release): handle versioning scheme in binary verification #1834

Merged
merged 2 commits into from
May 8, 2024
Merged

fix(dev/release): handle versioning scheme in binary verification #1834

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b5f144
fix(dev/release): handle versioning scheme in binary verification
lidavidm May 8, 2024
494611b
Always use VERSION_NATIVE
lidavidm May 8, 2024
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
26 changes: 20 additions & 6 deletions dev/release/verify-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,15 @@ ensure_source_directory() {
if [ ! -d "${ARROW_SOURCE_DIR}" ]; then
git clone --depth=1 https://github.com/$ARROW_REPOSITORY $ARROW_SOURCE_DIR
fi

source "${ADBC_SOURCE_DIR}/dev/release/versions.env"
echo "Versions:"
echo "Release: ${RELEASE} (requested: ${VERSION})"
echo "C#: ${VERSION_CSHARP}"
echo "Java: ${VERSION_JAVA}"
echo "C/C++/GLib/Go/Python/Ruby: ${VERSION_NATIVE}"
echo "R: ${VERSION_R}"
echo "Rust: ${VERSION_RUST}"
}

test_source_distribution() {
Expand Down Expand Up @@ -693,6 +702,8 @@ test_linux_wheels() {
local arch="x86_64"
fi

local declared_package_version="${VERSION_NATIVE}"
local package_version="${TEST_PYARROW_VERSION:-${declared_package_version}}"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
local package_version="${TEST_PYARROW_VERSION:-${declared_package_version}}"
local package_version="${TEST_ADBC_VERSION:-${declared_package_version}}"

Or TEST_ADBC_PYTHON_VERSION.

(I think that we can always use ${VERSION_NATIVE} here.)

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed to always use VERSION_NATIVE

local python_versions="${TEST_PYTHON_VERSIONS:-3.9 3.10 3.11}"

for python in ${python_versions}; do
Expand All @@ -701,21 +712,24 @@ test_linux_wheels() {
CONDA_ENV=wheel-${pyver}-${arch} PYTHON_VERSION=${pyver} maybe_setup_conda || exit 1
VENV_ENV=wheel-${pyver}-${arch} PYTHON_VERSION=${pyver} maybe_setup_virtualenv || continue
pip install --force-reinstall \
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-cp${pyver/.}-cp${python/.}-manylinux*${arch}*.whl \
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-py3-none-manylinux*${arch}*.whl
adbc_*-${package_version}-cp${pyver/.}-cp${python/.}-manylinux*${arch}*.whl \
adbc_*-${package_version}-py3-none-manylinux*${arch}*.whl
${ADBC_DIR}/ci/scripts/python_wheel_unix_test.sh ${ADBC_SOURCE_DIR}
done
}

test_macos_wheels() {
local python_versions="3.9 3.10 3.11"
# apple silicon processor
if [ "$(uname -m)" = "arm64" ]; then
local platform_tags="arm64"
else
local platform_tags="x86_64"
fi

local declared_package_version="${VERSION_NATIVE}"
local package_version="${TEST_PYARROW_VERSION:-${declared_package_version}}"
Copy link
Member

Choose a reason for hiding this comment

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

ditto.

local python_versions="${TEST_PYTHON_VERSIONS:-3.9 3.10 3.11}"

# verify arch-native wheels inside an arch-native conda environment
for python in ${python_versions}; do
local pyver=${python/m}
Expand All @@ -726,8 +740,8 @@ test_macos_wheels() {
VENV_ENV=wheel-${pyver}-${platform} PYTHON_VERSION=${pyver} maybe_setup_virtualenv || continue

pip install --force-reinstall \
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-cp${pyver/.}-cp${python/.}-macosx_*_${platform}.whl \
adbc_*-${TEST_PYARROW_VERSION:-${VERSION}}-py3-none-macosx_*_${platform}.whl
adbc_*-${package_version}-cp${pyver/.}-cp${python/.}-macosx_*_${platform}.whl \
adbc_*-${package_version}-py3-none-macosx_*_${platform}.whl
${ADBC_DIR}/ci/scripts/python_wheel_unix_test.sh ${ADBC_SOURCE_DIR}
done
done
Expand Down Expand Up @@ -765,7 +779,7 @@ test_jars() {
local -r components=(".jar" "-javadoc.jar" "-sources.jar")
for package in "${packages[@]}"; do
for component in "${components[@]}"; do
local filename="${BINARY_DIR}/${package}-${VERSION}${component}"
local filename="${BINARY_DIR}/${package}-${VERSION_JAVA}${component}"
if [[ ! -f "${filename}" ]]; then
echo "ERROR: missing artifact ${filename}"
return 1
Expand Down
Loading