Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add python 3.9.2, 3.8.8, 3.7.10 and 3.6.13 #3204

Merged
merged 4 commits into from
Mar 9, 2021
Merged

Add python 3.9.2, 3.8.8, 3.7.10 and 3.6.13 #3204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bff753c
Add python 3.9.2, 3.8.8, 3.7.10 and 3.6.13
Parnassius Feb 22, 2021
e9371e9
Fux pipenv version resolver spec
feelepxyz Mar 8, 2021
52e63b0
Merge remote-tracking branch 'origin/main' into python-3.9.2
feelepxyz Mar 8, 2021
4e07dbe
Merge remote-tracking branch 'origin/main' into python-3.9.2
feelepxyz Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ RUN apt-get install -y software-properties-common \
ENV PYENV_ROOT=/usr/local/.pyenv \
PATH="/usr/local/.pyenv/bin:$PATH"
RUN git clone https://github.com/pyenv/pyenv.git /usr/local/.pyenv \
&& cd /usr/local/.pyenv && git checkout v1.2.22 && cd - \
&& pyenv install 3.9.1 \
&& cd /usr/local/.pyenv && git checkout 9ee109b66148bc39a685926050b7b56cb4bb184b && cd - \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it's released now https://github.com/pyenv/pyenv/releases/tag/v1.2.23

Suggested change
&& cd /usr/local/.pyenv && git checkout 9ee109b66148bc39a685926050b7b56cb4bb184b && cd - \
&& cd /usr/local/.pyenv && git checkout v1.2.23 && cd - \

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see now that it doesn't include all the new versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, 1.2.23 is missing 3.9.2 and 3.8.8

&& pyenv install 3.9.2 \
&& pyenv install 2.7.18 \
&& pyenv global 3.9.1
&& pyenv global 3.9.2


### JAVASCRIPT
Expand Down
2 changes: 1 addition & 1 deletion python/helpers/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ cp -r \

cd "$install_dir"
PYENV_VERSION=2.7.18 pyenv exec pip install -r "requirements.txt"
PYENV_VERSION=3.9.1 pyenv exec pip install -r "requirements.txt"
PYENV_VERSION=3.9.2 pyenv exec pip install -r "requirements.txt"
12 changes: 6 additions & 6 deletions python/lib/dependabot/python/python_versions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ module Dependabot
module Python
module PythonVersions
PRE_INSTALLED_PYTHON_VERSIONS = %w(
3.9.1 2.7.18
3.9.2 2.7.18
).freeze

# Due to an OpenSSL issue we can only install the following versions in
# the Dependabot container.
SUPPORTED_VERSIONS = %w(
3.9.1 3.9.0
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.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.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
3.9.2 3.9.1 3.9.0
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.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.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
2.7.18 2.7.17 2.7.16 2.7.15 2.7.14 2.7.13
).freeze

Expand Down
6 changes: 3 additions & 3 deletions python/spec/dependabot/python/update_checker/pipenv_version_resolver_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@
it "raises a helpful error" do
expect { subject }.
to raise_error(Dependabot::DependencyFileNotResolvable) do |error|
expect(error.message).to eq(
expect(error.message).to start_with(
"pipenv.patched.notpip._internal.exceptions."\
"UnsupportedPythonVersion: futures requires Python '>=2.6, <3' "\
"but the running Python is 3.7.9"
"but the running Python is 3."
)
end
end
Expand Down Expand Up @@ -255,7 +255,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.1, 3.9.0, 3.8.7")
to include("supported in Dependabot: 3.9.2, 3.9.1, 3.9.0")
end
end
end
Expand Down