Remove all sys.version_info >= (3, 8) checks as Python 3.7 is no longer supported

This commit is contained in:
Damian Shaw 2025-06-15 11:02:57 -04:00
parent c8f234f136
commit 27fe68c85f
12 changed files with 12 additions and 79 deletions

View file

@ -17,14 +17,8 @@
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
import sys
import sphinx_rtd_theme import sphinx_rtd_theme
from importlib.metadata import Distribution
if sys.version_info >= (3, 8):
from importlib.metadata import Distribution
else:
from importlib_metadata import Distribution
html_theme = "sphinx_rtd_theme" html_theme = "sphinx_rtd_theme"

View file

@ -1,7 +1,6 @@
"""Lite simulation of the top linux command.""" """Lite simulation of the top linux command."""
import datetime import datetime
import random import random
import sys
import time import time
from dataclasses import dataclass from dataclasses import dataclass
@ -9,11 +8,7 @@ from rich import box
from rich.console import Console from rich.console import Console
from rich.live import Live from rich.live import Live
from rich.table import Table from rich.table import Table
from typing import Literal
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal
@dataclass @dataclass

View file

@ -1,12 +1,6 @@
import sys
from fractions import Fraction from fractions import Fraction
from math import ceil from math import ceil
from typing import cast, List, Optional, Sequence from typing import cast, List, Optional, Sequence, Protocol
if sys.version_info >= (3, 8):
from typing import Protocol
else:
from typing_extensions import Protocol # pragma: no cover
class Edge(Protocol): class Edge(Protocol):

View file

@ -1,11 +1,5 @@
import sys
from itertools import chain from itertools import chain
from typing import TYPE_CHECKING, Iterable, Optional from typing import TYPE_CHECKING, Iterable, Optional, Literal
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal # pragma: no cover
from .constrain import Constrain from .constrain import Constrain
from .jupyter import JupyterMixin from .jupyter import JupyterMixin

View file

@ -1,10 +1,4 @@
import sys from typing import TYPE_CHECKING, Iterable, List, Literal
from typing import TYPE_CHECKING, Iterable, List
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal # pragma: no cover
from ._loop import loop_last from ._loop import loop_last

View file

@ -33,15 +33,7 @@ from typing import (
) )
from rich._null_file import NULL_FILE from rich._null_file import NULL_FILE
from typing import Literal, Protocol, runtime_checkable
if sys.version_info >= (3, 8):
from typing import Literal, Protocol, runtime_checkable
else:
from typing_extensions import (
Literal,
Protocol,
runtime_checkable,
) # pragma: no cover
from . import errors, themes from . import errors, themes
from ._emoji_replace import _emoji_replace from ._emoji_replace import _emoji_replace

View file

@ -1,11 +1,5 @@
import sys
import time import time
from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union, Final
if sys.version_info >= (3, 8):
from typing import Final
else:
from typing_extensions import Final # pragma: no cover
from .segment import ControlCode, ControlType, Segment from .segment import ControlCode, ControlType, Segment

View file

@ -1,5 +1,5 @@
import sys import sys
from typing import TYPE_CHECKING, Optional, Union from typing import TYPE_CHECKING, Optional, Union, Literal
from .jupyter import JupyterMixin from .jupyter import JupyterMixin
from .segment import Segment from .segment import Segment
@ -7,11 +7,6 @@ from .style import Style
from ._emoji_codes import EMOJI from ._emoji_codes import EMOJI
from ._emoji_replace import _emoji_replace from ._emoji_replace import _emoji_replace
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal # pragma: no cover
if TYPE_CHECKING: if TYPE_CHECKING:
from .console import Console, ConsoleOptions, RenderResult from .console import Console, ConsoleOptions, RenderResult

View file

@ -1,10 +1,4 @@
import sys from typing import Optional, Tuple, Literal
from typing import Optional, Tuple
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal # pragma: no cover
from ._loop import loop_last from ._loop import loop_last

View file

@ -1,16 +1,11 @@
from __future__ import annotations from __future__ import annotations
import sys import sys
from typing import ClassVar, Iterable from typing import ClassVar, Iterable, get_args
from markdown_it import MarkdownIt from markdown_it import MarkdownIt
from markdown_it.token import Token from markdown_it.token import Token
if sys.version_info >= (3, 8):
from typing import get_args
else:
from typing_extensions import get_args # pragma: no cover
from rich.table import Table from rich.table import Table
from . import box from . import box

View file

@ -33,11 +33,7 @@ from typing import (
TypeVar, TypeVar,
Union, Union,
) )
from typing import Literal
if sys.version_info >= (3, 8):
from typing import Literal
else:
from typing_extensions import Literal # pragma: no cover
if sys.version_info >= (3, 11): if sys.version_info >= (3, 11):
from typing import Self from typing import Self

View file

@ -19,11 +19,7 @@ from rich.syntax import (
) )
from .render import render from .render import render
from importlib.metadata import Distribution
if sys.version_info >= (3, 8):
from importlib.metadata import Distribution
else:
from importlib_metadata import Distribution
PYGMENTS_VERSION = Distribution.from_name("pygments").version PYGMENTS_VERSION = Distribution.from_name("pygments").version
OLD_PYGMENTS = PYGMENTS_VERSION == "2.13.0" OLD_PYGMENTS = PYGMENTS_VERSION == "2.13.0"