This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ba8d33890244596d311dca94bb8f2758250fcc2b Author: Stephen Mallette <[email protected]> AuthorDate: Fri Apr 15 07:14:42 2022 -0400 Build python on 3.8 in docker and bump test dependencies. CTR --- docker/Dockerfile | 11 ++++++++--- gremlin-python/src/main/python/setup.py | 7 +++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1480adff82..e12cc0f962 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,10 +35,15 @@ RUN apt-get install -y openjdk-8-jdk openjdk-11-jdk gawk git maven openssh-serve RUN apt-get install -y --force-yes dotnet-sdk-6.0 mono-devel ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get install -y python3 python3-dev python3-pip build-essential checkinstall zlib1g-dev libreadline-gplv2-dev \ +RUN apt-get install -y python3 python3.8 python3-dev python3.8-dev python3-pip build-essential checkinstall zlib1g-dev libreadline-gplv2-dev \ libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libkrb5-dev krb5-user -RUN pip3 install virtualenv -RUN pip3 install virtualenvwrapper --no-deps + +# make python3 be python 3.8 +RUN rm /usr/bin/python3 +RUN ln -s python3.8 /usr/bin/python3 +RUN python3 -m pip install --upgrade pip +RUN pip install virtualenv +RUN pip install virtualenvwrapper --no-deps RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-8-jdk RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-11-jdk diff --git a/gremlin-python/src/main/python/setup.py b/gremlin-python/src/main/python/setup.py index 74d7fe3cb2..b9b9bc5614 100644 --- a/gremlin-python/src/main/python/setup.py +++ b/gremlin-python/src/main/python/setup.py @@ -69,11 +69,11 @@ setup( test_suite="tests", data_files=[("", ["LICENSE", "NOTICE"])], setup_requires=[ - 'pytest-runner==5.2', + 'pytest-runner==6.0.0', 'importlib-metadata<3.0.0' ], tests_require=[ - 'pytest>=4.6.4,<7.1.0', + 'pytest>=4.6.4,<7.2.0', 'mock>=3.0.5,<4.0.0', 'radish-bdd==0.8.6', 'PyHamcrest>=1.9.0,<2.0.0' @@ -86,7 +86,6 @@ setup( "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Natural Language :: English", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3" ] )
