You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2019/01/11 21:04:22 UTC
[arrow] branch master updated: ARROW-4238: [Packaging] Fix RC
version conflict between crossbow and rake
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 38a628d ARROW-4238: [Packaging] Fix RC version conflict between crossbow and rake
38a628d is described below
commit 38a628dff6fcd5f3c7e6b402f5ceb35cc8bd52c8
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Sat Jan 12 06:03:45 2019 +0900
ARROW-4238: [Packaging] Fix RC version conflict between crossbow and rake
This shouldn't affect the current release candidate, the binaries are already building this way.
Can be merged after RC0 is finished (either way).
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #3380 from kszucs/ARROW-4238 and squashes the following commits:
0e865002 <Krisztián Szűcs> use no_rc_version everywhere
---
dev/release/00-prepare.sh | 4 ++
dev/tasks/conda-recipes/appveyor.yml | 2 +-
dev/tasks/conda-recipes/travis.linux.yml | 2 +-
dev/tasks/conda-recipes/travis.osx.yml | 2 +-
dev/tasks/crossbow.py | 4 +-
dev/tasks/python-wheels/appveyor.yml | 2 +-
dev/tasks/python-wheels/travis.linux.yml | 2 +-
dev/tasks/python-wheels/travis.osx.yml | 2 +-
dev/tasks/tasks.yml | 86 ++++++++++++++++----------------
9 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh
index 1c233a3..96bfd69 100755
--- a/dev/release/00-prepare.sh
+++ b/dev/release/00-prepare.sh
@@ -107,6 +107,8 @@ update_versions() {
}
if [ "$#" -eq 2 ]; then
+ ############################## Pre-Tag Commits ##############################
+
version=$1
next_version=$2
next_version_snapshot=${next_version}-SNAPSHOT
@@ -136,6 +138,8 @@ if [ "$#" -eq 2 ]; then
mvn release:prepare -Dtag=${tag} -DreleaseVersion=${version} -DautoVersionSubmodules -DdevelopmentVersion=${next_version_snapshot}
cd -
+ ############################## Post-Tag Commits #############################
+
echo "Updating versions for ${next_version_snapshot}"
update_versions "${version}" "${next_version}" "snapshot"
git commit -m "[Release] Update versions for ${next_version_snapshot}"
diff --git a/dev/tasks/conda-recipes/appveyor.yml b/dev/tasks/conda-recipes/appveyor.yml
index cdc9d97..3d3ba43 100644
--- a/dev/tasks/conda-recipes/appveyor.yml
+++ b/dev/tasks/conda-recipes/appveyor.yml
@@ -16,7 +16,7 @@
# under the License.
environment:
- ARROW_VERSION: {{ arrow.version }}
+ ARROW_VERSION: {{ arrow.no_rc_version }}
# regardless of the python version we build against
CONDA_INSTALL_LOCN: C:\Miniconda36-x64
diff --git a/dev/tasks/conda-recipes/travis.linux.yml b/dev/tasks/conda-recipes/travis.linux.yml
index a3c2929..f0c4c77 100644
--- a/dev/tasks/conda-recipes/travis.linux.yml
+++ b/dev/tasks/conda-recipes/travis.linux.yml
@@ -25,7 +25,7 @@ if: tag IS blank
env:
global:
- TRAVIS_TAG={{ task.tag }}
- - ARROW_VERSION={{ arrow.version }}
+ - ARROW_VERSION={{ arrow.no_rc_version }}
- PYTHONUNBUFFERED=1
install:
diff --git a/dev/tasks/conda-recipes/travis.osx.yml b/dev/tasks/conda-recipes/travis.osx.yml
index 6b3e561..23fd6e1 100644
--- a/dev/tasks/conda-recipes/travis.osx.yml
+++ b/dev/tasks/conda-recipes/travis.osx.yml
@@ -25,7 +25,7 @@ if: tag IS blank
env:
global:
- TRAVIS_TAG={{ task.tag }}
- - ARROW_VERSION={{ arrow.version }}
+ - ARROW_VERSION={{ arrow.no_rc_version }}
- PYTHONUNBUFFERED=1
before_install:
diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py
index d700384..2d0c530 100755
--- a/dev/tasks/crossbow.py
+++ b/dev/tasks/crossbow.py
@@ -396,6 +396,7 @@ class Target:
self.branch = branch
self.remote = remote
self.version = version
+ self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
@classmethod
def from_repo(cls, repo, version=None):
@@ -631,10 +632,9 @@ def submit(ctx, task, group, job_prefix, config_path, arrow_version,
# instantiate target from the locally checked out repository and branch
target = Target.from_repo(arrow, version=arrow_version)
- no_rc_version = re.sub(r'-rc\d+\Z', '', target.version)
params = {
'version': target.version,
- 'no_rc_version': no_rc_version,
+ 'no_rc_version': target.no_rc_version,
}
# task and group variables are lists, containing multiple values
diff --git a/dev/tasks/python-wheels/appveyor.yml b/dev/tasks/python-wheels/appveyor.yml
index c220f92..be6ad30 100644
--- a/dev/tasks/python-wheels/appveyor.yml
+++ b/dev/tasks/python-wheels/appveyor.yml
@@ -24,7 +24,7 @@ environment:
PYTHON: "{{ python_version }}"
MSVC_DEFAULT_OPTIONS: ON
ARROW_SRC: C:\apache-arrow
- PYARROW_VERSION: {{ arrow.version }}
+ PYARROW_VERSION: {{ arrow.no_rc_version }}
PYARROW_REF: {{ arrow.head }}
init:
diff --git a/dev/tasks/python-wheels/travis.linux.yml b/dev/tasks/python-wheels/travis.linux.yml
index 17888cc..b5cbc65 100644
--- a/dev/tasks/python-wheels/travis.linux.yml
+++ b/dev/tasks/python-wheels/travis.linux.yml
@@ -40,7 +40,7 @@ script:
# build wheel
- pushd arrow/python/manylinux1
- docker run --shm-size=2g
- -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.version }}
+ -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }}
-e PYTHON_VERSIONS="{{ python_version }},{{ unicode_width }}"
-v $PWD:/io
-v $PWD/../../:/arrow
diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml
index c6bd010..a988413 100644
--- a/dev/tasks/python-wheels/travis.osx.yml
+++ b/dev/tasks/python-wheels/travis.osx.yml
@@ -26,7 +26,7 @@ env:
- PLAT=x86_64
- TRAVIS_TAG={{ task.tag }}
- MACOSX_DEPLOYMENT_TARGET="10.9"
- - PYARROW_VERSION={{ arrow.version }}
+ - PYARROW_VERSION={{ arrow.no_rc_version }}
- PYARROW_BUILD_VERBOSE=1
- MB_PYTHON_VERSION={{ python_version }}
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 4b10b57..ce311e5 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -66,7 +66,7 @@ tasks:
# artifacts: list of regex patterns, each needs to match a single github
# release asset, version variable is replaced in the pattern
# e.g.:
- # - pyarrow-{version}-py36(h[a-z0-9]+)_0-linux-64.tar.bz2
+ # - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0-linux-64.tar.bz2
############################## Conda Linux ##################################
@@ -76,8 +76,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython2.7.yaml
artifacts:
- - arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
conda-linux-gcc-py36:
platform: linux
@@ -85,8 +85,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.6.yaml
artifacts:
- - arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
conda-linux-gcc-py37:
platform: linux
@@ -94,8 +94,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilergcccxx_compilergxxpython3.7.yaml
artifacts:
- - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
conda-linux-toolchain-py27:
platform: linux
@@ -103,8 +103,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
artifacts:
- - arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
conda-linux-toolchain-py36:
platform: linux
@@ -112,8 +112,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
artifacts:
- - arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
conda-linux-toolchain-py37:
platform: linux
@@ -121,8 +121,8 @@ tasks:
params:
variant_config_file: variants/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
artifacts:
- - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
############################## Conda OSX ####################################
@@ -132,8 +132,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml
artifacts:
- - arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
conda-osx-clang-py36:
platform: osx
@@ -141,8 +141,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml
artifacts:
- - arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
conda-osx-clang-py37:
platform: osx
@@ -150,8 +150,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml
artifacts:
- - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
conda-osx-toolchain-py27:
platform: osx
@@ -159,8 +159,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml
artifacts:
- - arrow-cpp-{version}-py27(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py27(h[a-z0-9]+)_0.tar.bz2
conda-osx-toolchain-py36:
platform: osx
@@ -168,8 +168,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml
artifacts:
- - arrow-cpp-{version}-py36(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
conda-osx-toolchain-py37:
platform: osx
@@ -177,8 +177,8 @@ tasks:
params:
variant_config_file: variants/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml
artifacts:
- - arrow-cpp-{version}-py37(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
############################## Conda Windows ################################
@@ -188,8 +188,8 @@ tasks:
params:
variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.6.yaml
artifacts:
- - arrow-cpp-{version}-py36_vc14(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py36(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py36_vc14(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py36(h[a-z0-9]+)_0.tar.bz2
conda-win-vs2015-py37:
platform: win
@@ -197,8 +197,8 @@ tasks:
params:
variant_config_file: variants\win_c_compilervs2015cxx_compilervs2015python3.7.yaml
artifacts:
- - arrow-cpp-{version}-py37_vc14(h[a-z0-9]+)_0.tar.bz2
- - pyarrow-{version}-py37(h[a-z0-9]+)_0.tar.bz2
+ - arrow-cpp-{no_rc_version}-py37_vc14(h[a-z0-9]+)_0.tar.bz2
+ - pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0.tar.bz2
############################## Wheel Linux ##################################
@@ -210,7 +210,7 @@ tasks:
unicode_width: 16
test_docker_images: []
artifacts:
- - pyarrow-{version}-cp27-cp27m-manylinux1_x86_64.whl
+ - pyarrow-{no_rc_version}-cp27-cp27m-manylinux1_x86_64.whl
wheel-linux-cp27mu:
platform: linux
@@ -221,7 +221,7 @@ tasks:
test_docker_images:
- python:2.7-slim # debian ucs4
artifacts:
- - pyarrow-{version}-cp27-cp27mu-manylinux1_x86_64.whl
+ - pyarrow-{no_rc_version}-cp27-cp27mu-manylinux1_x86_64.whl
wheel-linux-cp35m:
platform: linux
@@ -232,7 +232,7 @@ tasks:
test_docker_images:
- python:3.5-slim
artifacts:
- - pyarrow-{version}-cp35-cp35m-manylinux1_x86_64.whl
+ - pyarrow-{no_rc_version}-cp35-cp35m-manylinux1_x86_64.whl
wheel-linux-cp36m:
platform: linux
@@ -243,7 +243,7 @@ tasks:
test_docker_images:
- python:3.6-slim
artifacts:
- - pyarrow-{version}-cp36-cp36m-manylinux1_x86_64.whl
+ - pyarrow-{no_rc_version}-cp36-cp36m-manylinux1_x86_64.whl
wheel-linux-cp37m:
platform: linux
@@ -254,7 +254,7 @@ tasks:
test_docker_images:
- python:3.7-slim
artifacts:
- - pyarrow-{version}-cp37-cp37m-manylinux1_x86_64.whl
+ - pyarrow-{no_rc_version}-cp37-cp37m-manylinux1_x86_64.whl
############################## Wheel OSX ####################################
@@ -264,7 +264,7 @@ tasks:
params:
python_version: 2.7
artifacts:
- - pyarrow-{version}-cp27-cp27m-macosx_10_6_intel.whl
+ - pyarrow-{no_rc_version}-cp27-cp27m-macosx_10_6_intel.whl
wheel-osx-cp35m:
platform: osx
@@ -272,7 +272,7 @@ tasks:
params:
python_version: 3.5
artifacts:
- - pyarrow-{version}-cp35-cp35m-macosx_10_6_intel.whl
+ - pyarrow-{no_rc_version}-cp35-cp35m-macosx_10_6_intel.whl
wheel-osx-cp36m:
platform: osx
@@ -280,7 +280,7 @@ tasks:
params:
python_version: 3.6
artifacts:
- - pyarrow-{version}-cp36-cp36m-macosx_10_6_intel.whl
+ - pyarrow-{no_rc_version}-cp36-cp36m-macosx_10_6_intel.whl
wheel-osx-cp37m:
platform: osx
@@ -288,7 +288,7 @@ tasks:
params:
python_version: 3.7
artifacts:
- - pyarrow-{version}-cp37-cp37m-macosx_10_6_intel.whl
+ - pyarrow-{no_rc_version}-cp37-cp37m-macosx_10_6_intel.whl
############################## Wheel Windows ################################
@@ -298,7 +298,7 @@ tasks:
params:
python_version: 3.5
artifacts:
- - pyarrow-{version}-cp35-cp35m-win_amd64.whl
+ - pyarrow-{no_rc_version}-cp35-cp35m-win_amd64.whl
wheel-win-cp36m:
platform: win
@@ -306,7 +306,7 @@ tasks:
params:
python_version: 3.6
artifacts:
- - pyarrow-{version}-cp36-cp36m-win_amd64.whl
+ - pyarrow-{no_rc_version}-cp36-cp36m-win_amd64.whl
wheel-win-cp37m:
platform: win
@@ -314,7 +314,7 @@ tasks:
params:
python_version: 3.7
artifacts:
- - pyarrow-{version}-cp37-cp37m-win_amd64.whl
+ - pyarrow-{no_rc_version}-cp37-cp37m-win_amd64.whl
############################## Linux PKGS ####################################
@@ -597,10 +597,10 @@ tasks:
platform: linux
template: gandiva-jars/travis.linux.yml
artifacts:
- - arrow-gandiva-{version}-SNAPSHOT.jar
+ - arrow-gandiva-{no_rc_version}-SNAPSHOT.jar
gandiva-jar-osx:
platform: osx
template: gandiva-jars/travis.osx.yml
artifacts:
- - arrow-gandiva-{version}-SNAPSHOT.jar
+ - arrow-gandiva-{no_rc_version}-SNAPSHOT.jar