Simplify and fix Neural build for running tests

Author: w0rp

Dockerfile

@@ -1,59 +1,46 @@
-FROM testbed/vim:24
+FROM testbed/vim:24 AS build-vim
 
-# Add packages we need.
-#
-# We need most packages for installing Python.
-# We need nodejs for pyright.
+# Install tools for Vim testing.
+# We have a layer here so we rebuild Vim and Neovim less frequently.
+# Installing the Vim versions is the slowest build step.
+RUN install_vim -tag v8.0.0027 -build \
+                -tag v9.0.0297 -build \
+                -tag neovim:v0.8.0 -build
+
+RUN apk --update add git \
+    && git clone https://github.com/junegunn/vader.vim /vader \
+    && cd /vader \
+    && git checkout c6243dd81c98350df4dec608fa972df98fa2a3af
+
+FROM python:3.10-alpine
+
+# Copy shared libraries needed for Neovim.
+COPY --from=build-vim /usr/lib/libluv.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/libuv.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/libmsgpackc.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/libtermkey.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/libunibilium.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/libluajit-5.1.so.* /usr/lib/
+COPY --from=build-vim /usr/lib/lua /usr/lib/lua
+COPY --from=build-vim /vim-build /vim-build
+COPY --from=build-vim /vader /vader
+
+# Install scripting tools for test scripts.
+# We need nodejs for running pyright.
 ENV PACKAGES="\
     bash \
-    curl \
-    git \
-    build-base \
-    patch \
-    zlib-dev \
-    libffi-dev \
-    linux-headers \
-    readline-dev \
-    openssl \
-    nodejs \
-    openssl-dev \
-    sqlite-dev \
-    bzip2-dev \
-    python3 \
-    py3-pip \
     grep \
     sed \
+    nodejs \
 "
 RUN apk --update add $PACKAGES && \
     rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
-# Install tools for Python testing.
-ENV PATH=/root/.pyenv/shims:/root/.pyenv/bin:$PATH
-
-# Switch to the /root dir copy the .python-version from the project.
+# Switch to the /root dir for setting up the project.
 WORKDIR /root
 
-# Install tools for Vim testing.
-# We have a layer here so we rebuild Vim and Neovim less frequently.
-# Installing the Vim versions is the slowest build step.
-RUN install_vim -tag v8.0.0027 -build \
-                -tag v9.0.0297 -build \
-                -tag neovim:v0.8.0 -build
-RUN git clone https://github.com/junegunn/vader.vim vader && \
-    cd vader && git checkout c6243dd81c98350df4dec608fa972df98fa2a3af
-
-# Copy project files into the project for dependencies and such.
-COPY .python-version /root/
-
-# Install the Python version we need with uv.
-# We have a layer here so we rebuild Python and install uv less frequently.
-# Installing Python with uv is slower than updating dependencies, but much
-# faster than installing the Vim and Neovim versions.
-RUN curl https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash \
-    && eval "$(pyenv init -)" \
-    && eval "$(pyenv virtualenv-init -)" \
-    && pyenv install \
-    && pip install uv
+# Install setuptools and uv for Python
+RUN pip install uv
 
 # Sync dependencies and install the Python dependencies we need.
 # vim-vint is included here for running the Vim lint steps.

pyproject.toml

@@ -28,6 +28,7 @@ dependencies = [
 
 [dependency-groups]
 dev = [
+    "setuptools",
     "pyright==1.1.402",
     "pytest>=8.4.1",
     "ruff==0.10.0",

test/script/run-python

@@ -43,6 +43,7 @@ echo 'Running ruff'
 echo '========================================'
 echo 'ruff warnings/errors follow:'
 echo
+
 docker run -a stdout "${docker_flags[@]}" ruff check -q || exit_code=$?
 
 exit $exit_code

test/script/run-vader-tests

@@ -48,8 +48,6 @@ done
 vim="$1"
 tests="$2"
 
-echo "$vim"
-
 case $vim in
     # Neovim 0.6+ requires headless argument to load Vader tests.
     neovim*)