This is an automated email from the ASF dual-hosted git repository. Cole-Greer pushed a commit to branch master-ci-test in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 7bbd36c494e9af20bf5e13912d156a5ff50f0b47 Merge: d56f99f3f9 eea6a1dcbd Author: Cole Greer <[email protected]> AuthorDate: Tue Sep 15 17:23:29 2026 -0700 Merge branch '3.8-dev' gremlin-console/src/test/python/docker/Dockerfile | 21 ++++++++++++++++++--- gremlin-console/src/test/python/setup.cfg | 3 --- gremlin-console/src/test/python/setup.py | 17 +++++------------ 3 files changed, 23 insertions(+), 18 deletions(-) diff --cc gremlin-console/src/test/python/docker/Dockerfile index f4dec1f694,957bf917b4..49c4d54402 --- a/gremlin-console/src/test/python/docker/Dockerfile +++ b/gremlin-console/src/test/python/docker/Dockerfile @@@ -16,12 -16,27 +16,27 @@@ # under the License. # Image used for running integration tests for gremlin-console. - FROM python:3.10-bullseye -FROM eclipse-temurin:11-jre AS jre ++FROM eclipse-temurin:17-jre AS jre + + FROM python:3.10-bookworm LABEL maintainer="[email protected]" - RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre && apt-get install dos2unix + COPY --from=jre /opt/java/openjdk /opt/java/openjdk + ENV JAVA_HOME=/opt/java/openjdk + ENV PATH="${JAVA_HOME}/bin:${PATH}" + + RUN apt-get update && apt-get install -y --no-install-recommends dos2unix && rm -rf /var/lib/apt/lists/* + + # Test dependencies were previously pulled in via setup.py's tests_require and run + # through pytest-runner (setup.py test). That path was removed from modern setuptools, + # so the tests are now driven by pytest directly with the dependencies installed here. + RUN pip install --no-cache-dir \ + 'pytest>=6.2.5,<8.0.0' \ - 'mock>=3.0.5,<4.0.0' \ - 'more-itertools<11.0.0' \ - 'pexpect==4.8.0' ++ 'mock>=3.0.5,<5.1.0' \ ++ 'pexpect==4.9.0' \ ++ 'iniconfig<2.0.0' WORKDIR /console_app - CMD dos2unix ./gremlin-console/bin/gremlin.sh && python3 setup.py build && python3 setup.py test; \ + CMD dos2unix ./gremlin-console/bin/gremlin.sh && python3 -m pytest; \ EXIT_CODE=$?; chown -R `stat -c '%u:%g' .` .; exit $EXIT_CODE
