py39+

Committed via https://github.com/asottile/all-repos

Author: asottile

.github/workflows/main.yml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   main:
-    uses: asottile/workflows/.github/workflows/tox.yml@v1.6.0
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.7.0
     with:
-      env: '["py38", "py39", "py310", "py311", "py312"]'
+      env: '["py39", "py310", "py311", "py312", "py313"]'

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     rev: v3.13.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py38-plus, --add-import, 'from __future__ import annotations']
+        args: [--py39-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:
@@ -26,7 +26,7 @@ repos:
     rev: v3.17.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
     rev: v2.3.1
     hooks:

astpretty.py

@@ -3,9 +3,9 @@
 import argparse
 import ast
 import contextlib
+from collections.abc import Generator
+from collections.abc import Sequence
 from typing import Any
-from typing import Generator
-from typing import Sequence
 
 AST: tuple[type[Any], ...] = (ast.AST,)
 expr_context: tuple[type[Any], ...] = (ast.expr_context,)

setup.cfg

@@ -18,7 +18,7 @@ classifiers =
 
 [options]
 py_modules = astpretty
-python_requires = >=3.8
+python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =

tests/astpretty_test.py

@@ -136,7 +136,7 @@ def test_pformat_integer_indent():
 
 
 def test_pformat_nested_node_without_line_information():
-    expected_39 = (
+    expected = (
         'Subscript(\n'
         '    lineno=1,\n'
         '    col_offset=0,\n'
@@ -147,20 +147,6 @@ def test_pformat_nested_node_without_line_information():
         '    ctx=Load(),\n'
         ')'
     )
-    expected_38 = (
-        'Subscript(\n'
-        '    lineno=1,\n'
-        '    col_offset=0,\n'
-        '    end_lineno=1,\n'
-        '    end_col_offset=4,\n'
-        "    value=Name(lineno=1, col_offset=0, end_lineno=1, end_col_offset=1, id='a', ctx=Load()),\n"  # noqa: E501
-        '    slice=Index(\n'
-        '        value=Constant(lineno=1, col_offset=2, end_lineno=1, end_col_offset=3, value=0, kind=None),\n'  # noqa: E501
-        '    ),\n'
-        '    ctx=Load(),\n'
-        ')'
-    )
-    expected = expected_39 if sys.version_info >= (3, 9) else expected_38
     ret = astpretty.pformat(_to_expr_value('a[0]'))
     assert ret == expected
 
@@ -302,7 +288,7 @@ def f(
 
 
 def test_pformat_py38_type_comments(tmpdir, capsys):
-    expected_38 = '''\
+    expected_311 = '''\
 Module(
     body=[
         FunctionDef(
@@ -341,7 +327,7 @@ def test_pformat_py38_type_comments(tmpdir, capsys):
     type_ignores=[TypeIgnore(lineno=2, tag='')],
 )
 '''  # noqa: E501
-    expected = expected_312 if sys.version_info >= (3, 12) else expected_38
+    expected = expected_312 if sys.version_info >= (3, 12) else expected_311
     mod = (
         'def f():  # type: () -> None\n'
         '    pass  # type: ignore\n'

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,pypy3,pre-commit
+envlist = py3,pypy3,pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt