From 3e02e28489f0de3555f1cb18bb40d79bea22728c Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Mon, 15 Jan 2024 22:49:09 -0800 Subject: [PATCH] Clean up warnings in scripts --- scripts/generate_charmap_table.py | 6 +++--- scripts/tag_release.py | 8 +++----- setup.py | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/generate_charmap_table.py b/scripts/generate_charmap_table.py index 8154b5b8..c4137e8a 100755 --- a/scripts/generate_charmap_table.py +++ b/scripts/generate_charmap_table.py @@ -14,8 +14,8 @@ import tcod.tileset -def get_charmaps() -> Iterator[str]: - """Return an iterator of the current character maps from tcod.tilest.""" +def get_character_maps() -> Iterator[str]: + """Return an iterator of the current character maps from tcod.tileset.""" for name in dir(tcod.tileset): if name.startswith("CHARMAP_"): yield name[len("CHARMAP_") :].lower() @@ -60,7 +60,7 @@ def main() -> None: parser.add_argument( "charmap", action="store", - choices=list(get_charmaps()), + choices=list(get_character_maps()), type=str, help="which character map to generate a table from", ) diff --git a/scripts/tag_release.py b/scripts/tag_release.py index 2d528306..7b946513 100755 --- a/scripts/tag_release.py +++ b/scripts/tag_release.py @@ -34,11 +34,9 @@ def parse_changelog(args: argparse.Namespace) -> tuple[str, str]: ) assert match header, changes, tail = match.groups() - tagged = "\n## [{}] - {}\n{}".format( - args.tag, - datetime.date.today().isoformat(), # Local timezone is fine, probably. # noqa: DTZ011 - changes, - ) + + iso_date = datetime.datetime.now(tz=datetime.timezone.utc).date().isoformat() + tagged = f"\n## [{args.tag}] - {iso_date}\n{changes}" if args.verbose: print("--- Tagged section:") print(tagged) diff --git a/setup.py b/setup.py index 4027fbae..6e17d0f8 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def check_sdl_version() -> None: return needed_version = "{}.{}.{}".format(*SDL_VERSION_NEEDED) try: - sdl_version_str = subprocess.check_output(["sdl2-config", "--version"], universal_newlines=True).strip() + sdl_version_str = subprocess.check_output(["sdl2-config", "--version"], universal_newlines=True).strip() # noqa: S603, S607 except FileNotFoundError as exc: msg = ( f"libsdl2-dev or equivalent must be installed on your system and must be at least version {needed_version}."