Skip to content

Commit

Permalink
Merge pull request dependabot#4307 from Parnassius/pyenv-2-1-0
Browse files Browse the repository at this point in the history
Python: Upgrade pyenv to 2.1.0
  • Loading branch information
jurre authored Oct 12, 2021
2 parents 6e94cc3 + c60338c commit 9fa6ea2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ 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.0.6 --single-branch --depth=1 /usr/local/.pyenv \
&& pyenv install 3.9.7 \
&& pyenv global 3.9.7 \
RUN git clone https://github.com/pyenv/pyenv.git --branch v2.1.0 --single-branch --depth=1 /usr/local/.pyenv \
&& pyenv install 3.10.0 \
&& pyenv global 3.10.0 \
&& rm -Rf /tmp/python-build*
USER root

Expand Down
4 changes: 2 additions & 2 deletions python/helpers/build
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ cp -r \
"$install_dir"

cd "$install_dir"
PYENV_VERSION=3.9.7 pyenv exec pip install -r "requirements.txt"
PYENV_VERSION=3.10.0 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.9.7 pyenv exec poetry config experimental.new-installer false
PYENV_VERSION=3.10.0 pyenv exec poetry config experimental.new-installer false
7 changes: 4 additions & 3 deletions python/lib/dependabot/python/python_versions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ module Dependabot
module Python
module PythonVersions
PRE_INSTALLED_PYTHON_VERSIONS = %w(
3.9.7
3.10.0
).freeze

# Due to an OpenSSL issue we can only install the following versions in
# the Dependabot container.
SUPPORTED_VERSIONS = %w(
3.10.0
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.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
3.6.14 3.6.13 3.6.12 3.6.11 3.6.10 3.6.9 3.6.8 3.6.7 3.6.6 3.6.5 3.6.4 3.6.3
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
3.6.15 3.6.14 3.6.13 3.6.12 3.6.11 3.6.10 3.6.9 3.6.8 3.6.7 3.6.6 3.6.5 3.6.4 3.6.3
3.6.2 3.6.1 3.6.0 3.5.10 3.5.8 3.5.7 3.5.6 3.5.5 3.5.4 3.5.3
).freeze

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,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.9.7, 3.9.6, 3.9.5")
to include("supported in Dependabot: 3.10.0, 3.9.7, 3.9.6")
end
end
end
Expand Down

0 comments on commit 9fa6ea2

Please sign in to comment.