diff --git a/README.md b/README.md index 87c2c82ffb..ba94fdbbb2 100644 --- a/README.md +++ b/README.md @@ -229,4 +229,3 @@ Special thanks to all the contributors who have propelled GreptimeDB forward. Fo - GreptimeDB's query engine is powered by [Apache Arrow DataFusion™](https://arrow.apache.org/datafusion/). - [Apache OpenDAL™](https://opendal.apache.org) gives GreptimeDB a very general and elegant data access abstraction layer. - GreptimeDB's meta service is based on [etcd](https://etcd.io/). -- GreptimeDB uses [RustPython](https://github.com/RustPython/RustPython) for experimental embedded python scripting. diff --git a/docker/buildx/centos/Dockerfile b/docker/buildx/centos/Dockerfile index 588290661c..9e7b35b392 100644 --- a/docker/buildx/centos/Dockerfile +++ b/docker/buildx/centos/Dockerfile @@ -22,7 +22,7 @@ RUN unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/ # Install Rust SHELL ["/bin/bash", "-c"] RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y -ENV PATH /opt/rh/rh-python38/root/usr/bin:/usr/local/bin:/root/.cargo/bin/:$PATH +ENV PATH /usr/local/bin:/root/.cargo/bin/:$PATH # Build the project in release mode. RUN --mount=target=.,rw \ diff --git a/docker/dev-builder/android/Dockerfile b/docker/dev-builder/android/Dockerfile index 50cfce7395..b11a9015dd 100644 --- a/docker/dev-builder/android/Dockerfile +++ b/docker/dev-builder/android/Dockerfile @@ -13,12 +13,7 @@ RUN apt-get update && apt-get install -y \ curl \ git \ build-essential \ - pkg-config \ - python3 \ - python3-dev \ - python3-pip \ - && pip3 install --upgrade pip \ - && pip3 install pyarrow + pkg-config # Trust workdir RUN git config --global --add safe.directory /greptimedb diff --git a/docker/dev-builder/centos/Dockerfile b/docker/dev-builder/centos/Dockerfile index 04327ab393..25e7b90471 100644 --- a/docker/dev-builder/centos/Dockerfile +++ b/docker/dev-builder/centos/Dockerfile @@ -12,8 +12,6 @@ RUN yum install -y epel-release \ openssl \ openssl-devel \ centos-release-scl \ - rh-python38 \ - rh-python38-python-devel \ which # Install protoc @@ -23,7 +21,7 @@ RUN unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/ # Install Rust SHELL ["/bin/bash", "-c"] RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y -ENV PATH /opt/rh/rh-python38/root/usr/bin:/usr/local/bin:/root/.cargo/bin/:$PATH +ENV PATH /usr/local/bin:/root/.cargo/bin/:$PATH # Install Rust toolchains. ARG RUST_TOOLCHAIN diff --git a/docker/dev-builder/ubuntu/Dockerfile b/docker/dev-builder/ubuntu/Dockerfile index d0f5cb4f22..4dc89a12b1 100644 --- a/docker/dev-builder/ubuntu/Dockerfile +++ b/docker/dev-builder/ubuntu/Dockerfile @@ -6,11 +6,8 @@ ARG DOCKER_BUILD_ROOT=. ENV LANG en_US.utf8 WORKDIR /greptimedb -# Add PPA for Python 3.10. RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \ - add-apt-repository ppa:deadsnakes/ppa -y - + DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common # Install dependencies. RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libssl-dev \ @@ -20,9 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ ca-certificates \ git \ build-essential \ - pkg-config \ - python3.10 \ - python3.10-dev + pkg-config ARG TARGETPLATFORM RUN echo "target platform: $TARGETPLATFORM" @@ -38,12 +33,6 @@ fi RUN mv protoc3/bin/* /usr/local/bin/ RUN mv protoc3/include/* /usr/local/include/ -# Remove Python 3.8 and install pip. -RUN apt-get -y purge python3.8 && \ - apt-get -y autoremove && \ - ln -s /usr/bin/python3.10 /usr/bin/python3 && \ - curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 - # Silence all `safe.directory` warnings, to avoid the "detect dubious repository" error when building with submodules. # Disabling the safe directory check here won't pose extra security issues, because in our usage for this dev build # image, we use it solely on our own environment (that github action's VM, or ECS created dynamically by ourselves), @@ -56,10 +45,6 @@ RUN apt-get -y purge python3.8 && \ # it can be a different user that have prepared the submodules. RUN git config --global --add safe.directory '*' -# Install Python dependencies. -COPY $DOCKER_BUILD_ROOT/docker/python/requirements.txt /etc/greptime/requirements.txt -RUN python3 -m pip install -r /etc/greptime/requirements.txt - # Install Rust. SHELL ["/bin/bash", "-c"] RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y diff --git a/docker/python/requirements.txt b/docker/python/requirements.txt deleted file mode 100644 index b8a6b07526..0000000000 --- a/docker/python/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -numpy>=1.24.2 -pandas>=1.5.3 -pyarrow>=11.0.0 -requests>=2.28.2 -scipy>=1.10.1