foo-> bar in some test files, replace a couple instances of flake8_5 I missed, add py313 support now that hypothesmith is updated

Author: jakkdl

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ['3.9', '3.10', '3.11', '3.12']
+                python-version: ['3.9', '3.10', '3.11', '3.12', 3.13-dev]
             fail-fast: false
         steps:
             - uses: actions/checkout@v4

setup.py

@@ -42,6 +42,7 @@ def local_file(name: str) -> Path:
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
     long_description=(
         local_file("README.md").open().read()

tests/autofix_files/trio91x_autofix.py

@@ -38,10 +38,10 @@ async def foo_yield():  # TRIO911: 0, "exit", Statement("yield", lineno+2)
 
 
 async def foo_if():
-    if foo():
+    if bar():
         await trio.lowlevel.checkpoint()
         return  # TRIO910: 8, "return", Statement("function definition", lineno-2)
-    elif foo():
+    elif bar():
         await trio.lowlevel.checkpoint()
         return  # TRIO910: 8, "return", Statement("function definition", lineno-4)
     else:
@@ -66,18 +66,18 @@ async def foo_while2():
 async def foo_while3():
     await foo()
     while True:
-        if foo():
+        if bar():
             return
         await foo()
 
 
 # check that multiple checkpoints don't get inserted
 async def foo_while4():
     while True:
-        if foo():
+        if bar():
             await trio.lowlevel.checkpoint()
             yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno+2)  # TRIO911: 12, "yield", Statement("function definition", lineno-3)
-        if foo():
+        if bar():
             await trio.lowlevel.checkpoint()
             yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno-2)  # TRIO911: 12, "yield", Statement("function definition", lineno-5) # TRIO911: 12, "yield", Statement("yield", lineno-2)
             # this warns about the yield on lineno-2 twice, since it can arrive here from it in two different ways
@@ -102,7 +102,7 @@ async def foo_while_nested_func():
         yield  # TRIO911: 8, "yield", Statement("function definition", lineno-2) # TRIO911: 8, "yield", Statement("yield", lineno)
 
         async def bar():
-            while foo():
+            while bar():
                 ...
             await foo()
 
@@ -116,10 +116,10 @@ async def async_func(): ...
         ...
     except:
         ...
-    if foo() and foo():
+    if bar() and bar():
         ...
     while ...:
-        if foo():
+        if bar():
             continue
         break
     [... for i in range(5)]

tests/autofix_files/trio91x_autofix.py.diff

@@ -29,10 +29,10 @@
 
 
  async def foo_if():
-     if foo():
+     if bar():
 +        await trio.lowlevel.checkpoint()
          return  # TRIO910: 8, "return", Statement("function definition", lineno-2)
-     elif foo():
+     elif bar():
 +        await trio.lowlevel.checkpoint()
          return  # TRIO910: 8, "return", Statement("function definition", lineno-4)
      else:
@@ -50,10 +50,10 @@
 @@ x,8 x,10 @@
  async def foo_while4():
      while True:
-         if foo():
+         if bar():
 +            await trio.lowlevel.checkpoint()
              yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno+2)  # TRIO911: 12, "yield", Statement("function definition", lineno-3)
-         if foo():
+         if bar():
 +            await trio.lowlevel.checkpoint()
              yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno-2)  # TRIO911: 12, "yield", Statement("function definition", lineno-5) # TRIO911: 12, "yield", Statement("yield", lineno-2)
              # this warns about the yield on lineno-2 twice, since it can arrive here from it in two different ways

tests/eval_files/trio91x_autofix.py

@@ -33,9 +33,9 @@ async def foo_yield():  # TRIO911: 0, "exit", Statement("yield", lineno+2)
 
 
 async def foo_if():
-    if foo():
+    if bar():
         return  # TRIO910: 8, "return", Statement("function definition", lineno-2)
-    elif foo():
+    elif bar():
         return  # TRIO910: 8, "return", Statement("function definition", lineno-4)
     else:
         return  # TRIO910: 8, "return", Statement("function definition", lineno-6)
@@ -57,17 +57,17 @@ async def foo_while2():
 async def foo_while3():
     await foo()
     while True:
-        if foo():
+        if bar():
             return
         await foo()
 
 
 # check that multiple checkpoints don't get inserted
 async def foo_while4():
     while True:
-        if foo():
+        if bar():
             yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno+2)  # TRIO911: 12, "yield", Statement("function definition", lineno-3)
-        if foo():
+        if bar():
             yield  # TRIO911: 12, "yield", Statement("yield", lineno)  # TRIO911: 12, "yield", Statement("yield", lineno-2)  # TRIO911: 12, "yield", Statement("function definition", lineno-5) # TRIO911: 12, "yield", Statement("yield", lineno-2)
             # this warns about the yield on lineno-2 twice, since it can arrive here from it in two different ways
 
@@ -87,7 +87,7 @@ async def foo_while_nested_func():
         yield  # TRIO911: 8, "yield", Statement("function definition", lineno-2) # TRIO911: 8, "yield", Statement("yield", lineno)
 
         async def bar():
-            while foo():
+            while bar():
                 ...
             await foo()
 
@@ -101,10 +101,10 @@ async def async_func(): ...
         ...
     except:
         ...
-    if foo() and foo():
+    if bar() and bar():
         ...
     while ...:
-        if foo():
+        if bar():
             continue
         break
     [... for i in range(5)]

tox.ini

@@ -1,10 +1,10 @@
 # The test environment and commands
 [tox]
 # default environments to run without `-e`
-envlist = py{39,310,311,312}-{flake8_5,flake8_6}
+envlist = py{39,310,311,312,313}-{flake8_6,flake8_7}
 
 # create a default testenv, whose behaviour will depend on the name it's called with.
-# for CI you can call with `-e flake8_5,flake8_6` and let the CI handle python version
+# for CI you can call with `-e flake8_6,flake8_7` and let the CI handle python version
 [testenv]
 description = Runs pytest, optionally with posargs
 deps =
@@ -14,7 +14,8 @@ deps =
     pytest-cov
     pytest-xdist
     hypothesis
-    hypothesmith
+    # 0.3.3 adds py313 support
+    hypothesmith >= 0.3.3
     trio
 commands =
     pytest {posargs:-n auto}