Remove wildcard imports, other touchups (#63)

Basically a combination of autoflake, pyupgrade and isort

Author: hauntsaninja

data/empty_package/setup.py

@@ -1,4 +1,5 @@
 import sys
+
 from setuptools import setup
 
 increment = int(sys.argv.pop())

stub_uploader/build_wheel.py

@@ -23,9 +23,14 @@
 import subprocess
 import tempfile
 from textwrap import dedent
-from typing import Dict, List, Optional
+from typing import Optional
 
-from stub_uploader.const import *
+from stub_uploader.const import (
+    CHANGELOG_PATH,
+    META,
+    TESTS_NAMESPACE,
+    THIRD_PARTY_NAMESPACE,
+)
 from stub_uploader.metadata import Metadata, read_metadata
 
 CHANGELOG = "CHANGELOG.md"
@@ -99,7 +104,7 @@ def __init__(self, typeshed_dir: str, distribution: str) -> None:
         self.stub_dir = os.path.join(typeshed_dir, THIRD_PARTY_NAMESPACE, distribution)
 
 
-def find_stub_files(top: str) -> List[str]:
+def find_stub_files(top: str) -> list[str]:
     """Find all stub files for a given package, relative to package root.
 
     Raise if we find any unknown file extensions during collection.
@@ -169,7 +174,7 @@ def copy_changelog(distribution: str, dst: str) -> None:
         pass  # Ignore missing changelogs
 
 
-def collect_setup_entries(base_dir: str) -> Dict[str, List[str]]:
+def collect_setup_entries(base_dir: str) -> dict[str, list[str]]:
     """Generate package data for a setuptools.setup() call.
 
     This reflects the transformations done during copying in copy_stubs().
@@ -263,7 +268,7 @@ def main(
     commit = subprocess.run(
         ["git", "rev-parse", "HEAD"],
         capture_output=True,
-        universal_newlines=True,
+        text=True,
         cwd=typeshed_dir,
     ).stdout.strip()
     metadata = read_metadata(typeshed_dir, distribution)

stub_uploader/get_changed.py

@@ -11,16 +11,14 @@
 import os
 import subprocess
 
-from typing import List
 
-
-def main(typeshed_dir: str, commit: str) -> List[str]:
+def main(typeshed_dir: str, commit: str) -> list[str]:
     """List all distributions that changed since commit."""
     assert typeshed_dir.endswith(os.sep + "typeshed")
     git = subprocess.run(
         ["git", "diff", "--no-renames", "--name-only", "HEAD", commit],
         capture_output=True,
-        universal_newlines=True,
+        text=True,
         cwd=typeshed_dir,
         check=True,
     )

stub_uploader/get_version.py

@@ -12,15 +12,15 @@
 
 from __future__ import annotations
 
-from typing import Any, Union
+from typing import Any
 
 import requests
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
-from stub_uploader.const import *
+from stub_uploader.const import TYPES_PREFIX
 from stub_uploader.metadata import Metadata
 
 URL_TEMPLATE = "https://pypi.org/pypi/{}/json"

stub_uploader/metadata.py

@@ -4,7 +4,8 @@
 import graphlib
 import os
 import re
-from typing import Any, Dict, Iterator, Optional
+from typing import Any, Optional
+from collections.abc import Iterator
 
 import requests
 import tomli
@@ -18,7 +19,7 @@ class InvalidRequires(Exception):
 
 
 class Metadata:
-    def __init__(self, distribution: str, data: Dict[str, Any]):
+    def __init__(self, distribution: str, data: dict[str, Any]):
         assert not distribution.startswith(TYPES_PREFIX)
         self._alleged_upstream_distribution = distribution
         self.data = data

stub_uploader/update_changelog.py

@@ -9,12 +9,10 @@
 import os
 import re
 import subprocess
-from dataclasses import dataclass
 from pathlib import Path
 
 from stub_uploader.const import CHANGELOG_PATH
 
-
 THIRD_PARTY_NAMESPACE = "stubs"
 
 

tests/test_unit.py

@@ -134,5 +134,5 @@ def test_uploaded_packages() -> None:
         up.add("six")
         assert up.read() == {"types-sqlalchemy", "types-six"}
 
-        with open(file_path, "r") as f:
+        with open(file_path) as f:
             assert f.read() == "types-SqLaLcHeMy\ntypes-six"