Skip to content

Commit

Permalink
Make tests aware that py313 is the latest supported Python version (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexWaygood authored Jun 2, 2024
1 parent b36dd1a commit 9f3e609
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions crates/ruff_linter/resources/test/fixtures/pyupgrade/UP036_0.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ def g():
if sys.version_info > (3, 0): \
expected_error = []

if sys.version_info < (3,12):
if sys.version_info < (3,13):
print("py3")

if sys.version_info <= (3,12):
if sys.version_info <= (3,13):
print("py3")

if sys.version_info <= (3,12):
if sys.version_info <= (3,13):
print("py3")

if sys.version_info == 10000000:
Expand All @@ -197,10 +197,10 @@ def g():
if sys.version_info <= (3,10000000):
print("py3")

if sys.version_info > (3,12):
if sys.version_info > (3,13):
print("py3")

if sys.version_info >= (3,12):
if sys.version_info >= (3,13):
print("py3")

# Slices on `sys.version_info` should be treated equivalently.
Expand All @@ -210,10 +210,10 @@ def g():
if sys.version_info[:3] >= (3,0):
print("py3")

if sys.version_info[:2] > (3,13):
if sys.version_info[:2] > (3,14):
print("py3")

if sys.version_info[:3] > (3,13):
if sys.version_info[:3] > (3,14):
print("py3")

if sys.version_info > (3,0):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -663,13 +663,13 @@ UP036_0.py:179:8: UP036 [*] Version block is outdated for minimum Python version
179 |- if sys.version_info > (3, 0): \
180 179 | expected_error = []
181 180 |
182 181 | if sys.version_info < (3,12):
182 181 | if sys.version_info < (3,13):

UP036_0.py:182:4: UP036 [*] Version block is outdated for minimum Python version
|
180 | expected_error = []
181 |
182 | if sys.version_info < (3,12):
182 | if sys.version_info < (3,13):
| ^^^^^^^^^^^^^^^^^^^^^^^^^ UP036
183 | print("py3")
|
Expand All @@ -679,10 +679,10 @@ UP036_0.py:182:4: UP036 [*] Version block is outdated for minimum Python version
179 179 | if sys.version_info > (3, 0): \
180 180 | expected_error = []
181 181 |
182 |-if sys.version_info < (3,12):
182 |-if sys.version_info < (3,13):
183 |- print("py3")
184 182 |
185 183 | if sys.version_info <= (3,12):
185 183 | if sys.version_info <= (3,13):
186 184 | print("py3")

UP036_0.py:191:24: UP036 Version specifier is invalid
Expand Down Expand Up @@ -716,17 +716,17 @@ UP036_0.py:203:4: UP036 [*] Version block is outdated for minimum Python version
|
201 | print("py3")
202 |
203 | if sys.version_info >= (3,12):
203 | if sys.version_info >= (3,13):
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ UP036
204 | print("py3")
|
= help: Remove outdated version block

Unsafe fix
200 200 | if sys.version_info > (3,12):
200 200 | if sys.version_info > (3,13):
201 201 | print("py3")
202 202 |
203 |-if sys.version_info >= (3,12):
203 |-if sys.version_info >= (3,13):
204 |- print("py3")
203 |+print("py3")
205 204 |
Expand Down Expand Up @@ -771,7 +771,7 @@ UP036_0.py:210:4: UP036 [*] Version block is outdated for minimum Python version
211 |- print("py3")
210 |+print("py3")
212 211 |
213 212 | if sys.version_info[:2] > (3,13):
213 212 | if sys.version_info[:2] > (3,14):
214 213 | print("py3")

UP036_0.py:219:4: UP036 [*] Version block is outdated for minimum Python version
Expand All @@ -786,7 +786,7 @@ UP036_0.py:219:4: UP036 [*] Version block is outdated for minimum Python version
= help: Remove outdated version block

Unsafe fix
216 216 | if sys.version_info[:3] > (3,13):
216 216 | if sys.version_info[:3] > (3,14):
217 217 | print("py3")
218 218 |
219 |-if sys.version_info > (3,0):
Expand All @@ -801,5 +801,3 @@ UP036_0.py:219:4: UP036 [*] Version block is outdated for minimum Python version
226 |- "this is\
225 |+"this is\
227 226 | allowed too"


4 changes: 3 additions & 1 deletion crates/ruff_linter/src/settings/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ pub enum PythonVersion {
Py311,
Py312,
Py313,
// Remember to update the `latest()` function
// when adding new versions here!
}

impl From<PythonVersion> for Pep440Version {
Expand All @@ -62,7 +64,7 @@ impl From<PythonVersion> for Pep440Version {
impl PythonVersion {
/// Return the latest supported Python version.
pub const fn latest() -> Self {
Self::Py312
Self::Py313
}

pub const fn as_tuple(&self) -> (u8, u8) {
Expand Down

0 comments on commit 9f3e609

Please sign in to comment.