small ruff fixes

Author: wolph

progressbar/bar.py

@@ -34,7 +34,7 @@
 # float also accepts integers and longs but we don't want an explicit union
 # due to type checking complexity
 NumberT = float
-ValueT = typing.Union[NumberT, typing.Type[base.UnknownLength], None]
+ValueT = typing.Union[NumberT, type[base.UnknownLength], None]
 
 T = types.TypeVar('T')
 

progressbar/multi.py

@@ -43,7 +43,7 @@ class SortKey(str, enum.Enum):
     PERCENTAGE = 'percentage'
 
 
-class MultiBar(typing.Dict[str, bar.ProgressBar]):
+class MultiBar(dict[str, bar.ProgressBar]):
     fd: typing.TextIO
     _buffer: io.StringIO
 

progressbar/terminal/stream.py

@@ -2,8 +2,8 @@
 
 import sys
 import typing
+from collections.abc import Iterable, Iterator
 from types import TracebackType
-from typing import Iterable, Iterator
 
 from progressbar import base
 

progressbar/utils.py

@@ -8,8 +8,8 @@
 import os
 import re
 import sys
+from collections.abc import Iterable, Iterator
 from types import TracebackType
-from typing import Iterable, Iterator
 
 from python_utils import types
 from python_utils.converters import scale_1024

ruff.toml

@@ -1,16 +1,21 @@
 # We keep the ruff configuration separate so it can easily be shared across
 # all projects
 
-target-version = 'py38'
+target-version = 'py39'
 
 #src = ['progressbar']
 exclude = [
     '.venv',
     '.tox',
+    # Ignore local test files/directories/old-stuff
     'test.py',
+    '*_old.py',
 ]
 
-lint.ignore = [
+line-length = 79
+
+[lint]
+ignore = [
     'A001', # Variable {name} is shadowing a Python builtin
     'A002', # Argument {name} is shadowing a Python builtin
     'A003', # Class attribute {name} is shadowing a Python builtin
@@ -28,12 +33,14 @@ lint.ignore = [
     'RET506', # Unnecessary `else` after `raise` statement
     'Q001', # Remove bad quotes
     'Q002', # Remove bad quotes
+    'FA100', # Missing `from __future__ import annotations`, but uses `typing.Optional`
     'COM812', # Missing trailing comma in a list
     'ISC001', # String concatenation with implicit str conversion
     'SIM108', # Ternary operators are not always more readable
+    'RUF100', # Unused noqa directives. Due to multiple Python versions, we need to keep them
 ]
-line-length = 79
-lint.select = [
+
+select = [
     'A', # flake8-builtins
     'ASYNC', # flake8 async checker
     'B', # flake8-bugbear