Bump up vineyard version to v0.11.7

Signed-off-by: Tao He <[email protected]>

.github/workflows/build-compatibility.yml

@@ -131,10 +131,10 @@ jobs:
           # install python packages for codegen
           
           python3 -m pip install -U pip
-          python3 -m pip install libclang parsec
+          python3 -m pip install libclang parsec setuptools wheel
 
           /usr/local/bin/python3 -m pip install -U pip
-          /usr/local/bin/python3 -m pip install libclang parsec
+          /usr/local/bin/python3 -m pip install libclang parsec setuptools wheel
 
       - name: Install libgrape-lite
         run: |

.github/workflows/build-vineyardd-and-wheels-linux.yaml

@@ -116,7 +116,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
+        python: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311]
 
     steps:
       - uses: actions/checkout@v3
@@ -152,8 +152,16 @@ jobs:
 
       - name: Build wheel package on Linux
         run: |
+          if [[ "${{ matrix.python }}" == "cp311-cp311" ]];
+          then
+            export base=vineyard-manylinux1:20230115
+          else
+            export base=vineyard-manylinux1:20220512
+          fi
+
           sudo docker build . -f docker/pypa/Dockerfile.manylinux1-wheel \
                               -t ghcr.io/v6d-io/v6d/vineyard-wheel:${{ matrix.python }}.${{ github.sha }} \
+                              --build-arg BASE=$base \
                               --build-arg python=${{ matrix.python }}
           sudo docker run --rm -v `pwd`:/target ghcr.io/v6d-io/v6d/vineyard-wheel:${{ matrix.python }}.${{ github.sha }} sh -c "cp -r /work/fixed_wheels/ /target/"
           ls -la ./fixed_wheels/

.github/workflows/build-vineyardd-and-wheels-macos.yaml

@@ -202,7 +202,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-11]
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)
 
 set(VINEYARD_MAJOR_VERSION 0)
 set(VINEYARD_MINOR_VERSION 11)
-set(VINEYARD_PATCH_VERSION 6)
+set(VINEYARD_PATCH_VERSION 7)
 set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION})
 
 message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.")

charts/vineyard-operator/Chart.yaml

@@ -24,10 +24,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.11.6
+version: 0.11.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.11.6
+appVersion: 0.11.7
 

docker/pypa/Dockerfile.manylinux1

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/pypa/manylinux2010_x86_64:2022-05-08-ac9d5ec
+ARG BASE=manylinux2014_x86_64:2023-01-14-103cb93
+FROM quay.io/pypa/$BASE
 
 # target: ghcr.io/v6d-io/v6d/vineyard-manylinux1:20220512
+# target: ghcr.io/v6d-io/v6d/vineyard-manylinux2014:20230115
 
-RUN export PATH=$PATH:/opt/python/cp37-cp37m/bin && \
+RUN export PATH=$PATH:/opt/python/cp310-cp310/bin && \
     mkdir /deps && \
     cd /deps && \
     echo "Installing cmake ..." && \
@@ -51,9 +53,9 @@ RUN export PATH=$PATH:/opt/python/cp37-cp37m/bin && \
     cp -R boost_1_77_0/boost /usr/local/include/ && \
     echo "Installing apache-arrow ..." && \
     cd /deps && \
-    curl -L https://github.com/apache/arrow/archive/apache-arrow-1.0.1.tar.gz --output apache-arrow-1.0.1.tar.gz && \
-    tar zxvf apache-arrow-1.0.1.tar.gz && \
-    cd arrow-apache-arrow-1.0.1 && \
+    curl -L https://github.com/apache/arrow/archive/apache-arrow-10.0.1.tar.gz --output apache-arrow-10.0.1.tar.gz && \
+    tar zxvf apache-arrow-10.0.1.tar.gz && \
+    cd arrow-apache-arrow-10.0.1 && \
     mkdir build-dir && \
     cd build-dir && \
     cmake ../cpp \
@@ -97,7 +99,5 @@ RUN export PATH=$PATH:/opt/python/cp37-cp37m/bin && \
         -DARROW_BUILD_STATIC=ON \
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON && \
     make install -j`nproc` && \
-    echo "Prepare python dev dependencies ..." && \
-    pip3 install libclang parsec && \
     echo "Done." && \
     rm -rf /deps

docker/pypa/Dockerfile.manylinux1-wheel

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ghcr.io/v6d-io/v6d/vineyard-manylinux1:20220512
+ARG BASE=vineyard-manylinux1:20220512
+FROM ghcr.io/v6d-io/v6d/vineyard-$BASE
 
 # target: ghcr.io/v6d-io/v6d/vineyard-wheel
 
@@ -22,6 +23,7 @@ FROM ghcr.io/v6d-io/v6d/vineyard-manylinux1:20220512
 #   - cp38-cp38
 #   - cp39-cp39
 #   - cp310-cp310
+#   - cp311-cp311
 ARG python
 
 ADD . /work/v6d
@@ -30,7 +32,7 @@ RUN cd /work/v6d && \
     mkdir build && \
     cd build && \
     export PATH=$PATH:/opt/python/$python/bin && \
-    pip install -U pip setuptools wheel && \
+    pip install -U pip setuptools wheel libclang parsec && \
     cmake .. -DBUILD_SHARED_LIBS=OFF \
              -DBUILD_VINEYARD_SERVER=OFF \
              -DBUILD_VINEYARD_CLIENT=ON \

docker/vineyardd/Dockerfile.alpine-builder

@@ -63,11 +63,11 @@ RUN cd /tmp && \
         -DARROW_FLIGHT=OFF \
         -DARROW_GANDIVA=OFF \
         -DARROW_GANDIVA_JAVA=OFF \
-        -DARROW_HDFS=OFF \
+        -DARROW_HDFS=ON \
         -DARROW_HIVESERVER2=OFF \
         -DARROW_JSON=OFF \
-        -DARROW_ORC=OFF \
-        -DARROW_PARQUET=OFF \
+        -DARROW_ORC=ON \
+        -DARROW_PARQUET=ON \
         -DARROW_PLASMA=OFF \
         -DARROW_PLASMA_JAVA_CLIENT=OFF \
         -DARROW_PYTHON=OFF \
@@ -76,7 +76,7 @@ RUN cd /tmp && \
         -DARROW_WITH_ZLIB=OFF \
         -DARROW_WITH_LZ4=OFF \
         -DARROW_WITH_SNAPPY=OFF \
-        -DARROW_WITH_ZSTD=OFF \
+        -DARROW_WITH_ZSTD=ON \
         -DARROW_WITH_BROTLI=OFF \
         -DARROW_IPC=ON \
         -DARROW_BUILD_BENCHMARKS=OFF \
@@ -141,16 +141,16 @@ RUN cd /tmp && \
 #
 # note: remove shared libs
 RUN cd /tmp && \
-    wget -q https://zlib.net/zlib-1.2.12.tar.gz && \
-    tar zxf zlib-1.2.12.tar.gz && \
-    cd zlib-1.2.12 && \
+    wget -q https://zlib.net/zlib-1.2.13.tar.gz && \
+    tar zxf zlib-1.2.13.tar.gz && \
+    cd zlib-1.2.13 && \
     mkdir build && \
     cd build && \
     cmake .. -DBUILD_SHARED_LIBS=OFF && \
     make install -j`nproc` && \
     rm -rf /usr/local/lib/libz.so* && \
     cd /tmp && \
-    rm -rf zlib-1.2.12.tar.gz zlib-1.2.12
+    rm -rf zlib-1.2.13.tar.gz zlib-1.2.13
 
 # install openssl: boringssl doesn't bring headers when installing
 RUN cd /tmp && \

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 0.11.6
+version = 0.11.7
 
 [pycodestyle]
 max_line_length = 88

src/common/util/config.h

@@ -18,11 +18,11 @@ limitations under the License.
 
 #define VINEYARD_VERSION_MAJOR 0
 #define VINEYARD_VERSION_MINOR 11
-#define VINEYARD_VERSION_PATCH 6
+#define VINEYARD_VERSION_PATCH 7
 
 #define VINEYARD_VERSION                                              \
   ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \
       VINEYARD_VERSION_PATCH
-#define VINEYARD_VERSION_STRING "0.11.6"
+#define VINEYARD_VERSION_STRING "0.11.7"
 
 #endif  // SRC_COMMON_UTIL_CONFIG_H_