diff --git a/hyfetch/__init__.py b/hyfetch/__init__.py index 029ad4dd..12c5e444 100644 --- a/hyfetch/__init__.py +++ b/hyfetch/__init__.py @@ -1,6 +1,9 @@ +from __future__ import annotations +from . import main + + __version__ = '1.0.1' -from . import main if __name__ == '__main__': main.run() diff --git a/hyfetch/color_util.py b/hyfetch/color_util.py index 0fbc5c2c..78052978 100644 --- a/hyfetch/color_util.py +++ b/hyfetch/color_util.py @@ -1,5 +1,8 @@ +from __future__ import annotations + import colorsys -from typing import NamedTuple, Literal +from typing import NamedTuple +from typing_extensions import Literal AnsiMode = Literal['default', 'ansi', '8bit', 'rgb'] diff --git a/hyfetch/main.py b/hyfetch/main.py index a678dd62..c0a9d88d 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 +from __future__ import annotations import argparse import json from dataclasses import dataclass from pathlib import Path -from typing import Literal, Iterable +from typing import Iterable from hypy_utils import printc, json_stringify, color diff --git a/hyfetch/neofetch_util.py b/hyfetch/neofetch_util.py index 8eff3c51..07245f17 100644 --- a/hyfetch/neofetch_util.py +++ b/hyfetch/neofetch_util.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import re from pathlib import Path diff --git a/hyfetch/presets.py b/hyfetch/presets.py index 3b2eba6d..56e2ef03 100644 --- a/hyfetch/presets.py +++ b/hyfetch/presets.py @@ -1,7 +1,6 @@ from __future__ import annotations -from dataclasses import dataclass -from typing import Literal, Optional +from typing_extensions import Literal from .color_util import RGB diff --git a/setup.py b/setup.py index a1acabb1..408ed2d1 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,8 @@ import pathlib + +from setuptools import setup + import hyfetch -from setuptools import setup, find_packages # The directory containing this file HERE = pathlib.Path(__file__).parent @@ -22,13 +24,15 @@ setup( classifiers=[ "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", ], packages=['hyfetch'], package_data={'hyfetch': ['hyfetch/*']}, include_package_data=True, - install_requires=['hypy_utils==1.0.5'], + install_requires=['hypy_utils==1.0.6', 'typing_extensions'], entry_points={ "console_scripts": [ "hyfetch=hyfetch.main:run",