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.

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

Update tests for Python 3.9 on Ubuntu 24.04 #279

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/python_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ mod tests {
.unwrap(),
RequestedPythonVersion {
major: 3,
minor: 10,
minor: 9,
patch: Some(0),
origin: PythonVersionOrigin::RuntimeTxt,
}
Expand Down
3 changes: 2 additions & 1 deletion tests/django_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fn django_staticfiles_latest_django() {
);
}

// This tests the oldest Django version that works on Python 3.10 (which is the
// This tests the oldest Django version that works on Python 3.9 (which is the
// oldest Python that is available on all of our supported builders).
#[test]
#[ignore = "integration test"]
Expand All @@ -40,6 +40,7 @@ fn django_staticfiles_legacy_django() {
indoc! {"
[Generating Django static files]
Running 'manage.py collectstatic'
Linking '/workspace/testapp/static/robots.txt'

1 static file symlinked to '/workspace/staticfiles'.
"}
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.9
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This is the oldest Django version that works on Python 3.10 (which is the
# This is the oldest Django version that works on Python 3.9 (which is the
# oldest Python that is available on all of our supported builders).
Django==2.1.15
Django==1.8.19
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.10.0
python-3.9.0
13 changes: 3 additions & 10 deletions tests/python_version_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,7 @@ fn python_3_8() {
#[test]
#[ignore = "integration test"]
fn python_3_9() {
// Python 3.9 is only available on Heroku-22 and older.
let fixture = "tests/fixtures/python_3.9";
match builder().as_str() {
"heroku/builder:20" | "heroku/builder:22" => {
builds_with_python_version(fixture, &LATEST_PYTHON_3_9);
}
_ => rejects_non_existent_python_version(fixture, &LATEST_PYTHON_3_9),
};
builds_with_python_version("tests/fixtures/python_3.9", &LATEST_PYTHON_3_9);
}

#[test]
Expand Down Expand Up @@ -309,10 +302,10 @@ fn runtime_txt() {
context.pack_stdout,
indoc! {"
[Determining Python version]
Using Python version 3.10.0 specified in runtime.txt
Using Python version 3.9.0 specified in runtime.txt

[Installing Python]
Installing Python 3.10.0
Installing Python 3.9.0
"}
);
});
Expand Down