This is an automated email from the ASF dual-hosted git repository.
wesm 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 87cb95c ARROW-2716: [Python] Make manylinux1 base image independent
of Python patch releases
87cb95c is described below
commit 87cb95cb85548b35821f39722813acaa698c587f
Author: Korn, Uwe <[email protected]>
AuthorDate: Sat Jun 23 03:58:52 2018 -0400
ARROW-2716: [Python] Make manylinux1 base image independent of Python patch
releases
Author: Korn, Uwe <[email protected]>
Closes #2144 from xhochy/ARROW-2716 and squashes the following commits:
28e5220d <Korn, Uwe> ARROW-2716: Make manylinux1 base image independent of
Python patch releases
---
python/manylinux1/scripts/build_ccache.sh | 5 ++++-
python/manylinux1/scripts/build_virtualenvs.sh | 4 ++--
python/manylinux1/scripts/install_cmake.sh | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/python/manylinux1/scripts/build_ccache.sh
b/python/manylinux1/scripts/build_ccache.sh
index 681adec..c27f508 100755
--- a/python/manylinux1/scripts/build_ccache.sh
+++ b/python/manylinux1/scripts/build_ccache.sh
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-wget https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.bz2 -O
ccache-3.3.4.tar.bz2
+curl -sL https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.bz2 -o
ccache-3.3.4.tar.bz2
tar xf ccache-3.3.4.tar.bz2
pushd ccache-3.3.4
./configure --prefix=/usr
@@ -24,3 +24,6 @@ make -j5
make install
popd
rm -rf ccache-3.3.4.tar.bz2 ccache-3.3.4
+
+# Initialize the config directory, otherwise the build sometimes fails.
+mkdir /root/.ccache
diff --git a/python/manylinux1/scripts/build_virtualenvs.sh
b/python/manylinux1/scripts/build_virtualenvs.sh
index a983721..6eb0c5a 100755
--- a/python/manylinux1/scripts/build_virtualenvs.sh
+++ b/python/manylinux1/scripts/build_virtualenvs.sh
@@ -49,8 +49,8 @@ done
find /venv-test-*/lib/*/site-packages/pandas -name '*.so' -exec strip '{}' ';'
find /venv-test-*/lib/*/site-packages/numpy -name '*.so' -exec strip '{}' ';'
find /opt/_internal/cpython-*/lib/*/site-packages/pandas -name '*.so' -exec
strip '{}' ';'
-# Only Python 3.6 packages are stripable as they are built inside of the image
-find /opt/_internal/cpython-3.6.4/lib/python3.6/site-packages/numpy -name
'*.so' -exec strip '{}' ';'
+# Only Python 3.6 packages are stripable as they are built inside of the image
+find /opt/_internal/cpython-3.6.*/lib/python3.6/site-packages/numpy -name
'*.so' -exec strip '{}' ';'
find /opt/_internal/*/lib/*/site-packages/Cython -name '*.so' -exec strip '{}'
';'
# Remove pip cache again. It's useful during the virtualenv creation but we
diff --git a/python/manylinux1/scripts/install_cmake.sh
b/python/manylinux1/scripts/install_cmake.sh
index 8643485..cda2fce 100755
--- a/python/manylinux1/scripts/install_cmake.sh
+++ b/python/manylinux1/scripts/install_cmake.sh
@@ -19,4 +19,4 @@
/opt/python/cp35-cp35m/bin/pip install cmake ninja
ln -s /opt/python/cp35-cp35m/bin/cmake /usr/bin/cmake
ln -s /opt/python/cp35-cp35m/bin/ninja /usr/bin/ninja
-strip /opt/_internal/cpython-3.5.4/lib/python3.5/site-packages/cmake/data/bin/*
+strip /opt/_internal/cpython-3.*/lib/python3.5/site-packages/cmake/data/bin/*
