diff --git a/Dockerfile b/Dockerfile index a94e3512948..c603924c321 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,14 +83,14 @@ RUN apt-add-repository ppa:brightbox/ruby-ng \ ### PYTHON -# Install Python 2.7 and 3.9 with pyenv. Using pyenv lets us support multiple Pythons +# Install Python 3.10 with pyenv. ENV PYENV_ROOT=/usr/local/.pyenv \ PATH="/usr/local/.pyenv/bin:$PATH" RUN mkdir -p "$PYENV_ROOT" && chown dependabot:dependabot "$PYENV_ROOT" USER dependabot -RUN git clone https://github.com/pyenv/pyenv.git --branch v2.2.2 --single-branch --depth=1 /usr/local/.pyenv \ - && pyenv install 3.10.0 \ - && pyenv global 3.10.0 \ +RUN git clone https://github.com/pyenv/pyenv.git --branch v2.2.4 --single-branch --depth=1 /usr/local/.pyenv \ + && pyenv install 3.10.2 \ + && pyenv global 3.10.2 \ && rm -Rf /tmp/python-build* USER root diff --git a/python/helpers/build b/python/helpers/build index f33039c573b..7723f43bc63 100755 --- a/python/helpers/build +++ b/python/helpers/build @@ -18,9 +18,9 @@ cp -r \ "$install_dir" cd "$install_dir" -PYENV_VERSION=3.10.0 pyenv exec pip install -r "requirements.txt" +PYENV_VERSION=3.10.2 pyenv exec pip install -r "requirements.txt" # Workaround of https://github.com/python-poetry/poetry/issues/3010 # By default poetry config file is stored under ~/.config/pypoetry # and is not bound to any specific Python version -PYENV_VERSION=3.10.0 pyenv exec poetry config experimental.new-installer false +PYENV_VERSION=3.10.2 pyenv exec poetry config experimental.new-installer false diff --git a/python/lib/dependabot/python/python_versions.rb b/python/lib/dependabot/python/python_versions.rb index c9830b40470..8910e60f894 100644 --- a/python/lib/dependabot/python/python_versions.rb +++ b/python/lib/dependabot/python/python_versions.rb @@ -4,13 +4,13 @@ module Dependabot module Python module PythonVersions PRE_INSTALLED_PYTHON_VERSIONS = %w( - 3.10.0 + 3.10.2 ).freeze # Due to an OpenSSL issue we can only install the following versions in # the Dependabot container. SUPPORTED_VERSIONS = %w( - 3.10.0 + 3.10.2 3.10.1 3.10.0 3.9.9 3.9.8 3.9.7 3.9.6 3.9.5 3.9.4 3.9.2 3.9.1 3.9.0 3.8.12 3.8.11 3.8.10 3.8.9 3.8.8 3.8.7 3.8.6 3.8.5 3.8.4 3.8.3 3.8.2 3.8.1 3.8.0 3.7.12 3.7.11 3.7.10 3.7.9 3.7.8 3.7.7 3.7.6 3.7.5 3.7.4 3.7.3 3.7.2 3.7.1 3.7.0 diff --git a/python/spec/dependabot/python/update_checker/pipenv_version_resolver_spec.rb b/python/spec/dependabot/python/update_checker/pipenv_version_resolver_spec.rb index ad06c6b3c09..735b7508519 100644 --- a/python/spec/dependabot/python/update_checker/pipenv_version_resolver_spec.rb +++ b/python/spec/dependabot/python/update_checker/pipenv_version_resolver_spec.rb @@ -218,7 +218,7 @@ to start_with("Dependabot detected the following Python") expect(error.message).to include("3.4.*") expect(error.message). - to include("supported in Dependabot: 3.10.0, 3.9.9, 3.9.8") + to include("supported in Dependabot: 3.10.2, 3.10.1, 3.10.0") end end end