From ebf41cf047e0ed333c99cef47ab5d147029da1bc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Jan 2025 16:58:56 +1100 Subject: [PATCH] Cleanup: quiet mypy warnings --- .../datafiles/blender_icons_geom_update.py | 2 ++ release/datafiles/ctodata.py | 7 ++-- tools/utils/authors_git_gen.py | 2 +- tools/utils/gitea_inactive_developers.py | 35 ++++++++++--------- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py index 569c66b1a03..8de7bebe61d 100755 --- a/release/datafiles/blender_icons_geom_update.py +++ b/release/datafiles/blender_icons_geom_update.py @@ -108,6 +108,8 @@ def main() -> int: " " + "\n ".join(icon_files) + "\n", ) + return 0 + if __name__ == "__main__": sys.exit(main()) diff --git a/release/datafiles/ctodata.py b/release/datafiles/ctodata.py index e345da1dcce..485cd9ca5bb 100755 --- a/release/datafiles/ctodata.py +++ b/release/datafiles/ctodata.py @@ -10,7 +10,7 @@ __all__ = ( import sys -def main(): +def main() -> int: argv = sys.argv[:] strip_byte = False @@ -20,7 +20,7 @@ def main(): if len(argv) < 2: sys.stdout.write("Usage: ctodata [--strip-byte]\n") - sys.exit(1) + return 1 filename = argv[1] @@ -28,7 +28,7 @@ def main(): fpin = open(filename, "r") except: sys.stdout.write("Unable to open input {:s}\n".format(argv[1])) - sys.exit(1) + return 1 data_as_str = fpin.read().rsplit("{")[-1].split("}")[0] data_as_str = data_as_str.replace(",", " ") @@ -56,6 +56,7 @@ def main(): size = fpout.write(data) sys.stdout.write("{:d}\n".format(size)) + return 0 if __name__ == "__main__": diff --git a/tools/utils/authors_git_gen.py b/tools/utils/authors_git_gen.py index 10f23a5d69d..b4b4dd4d3cd 100755 --- a/tools/utils/authors_git_gen.py +++ b/tools/utils/authors_git_gen.py @@ -238,7 +238,7 @@ class Credits: def write_object( self, - fh: io.TextIOWrapper, + fh: io.TextIOBase, *, use_metadata: bool = False, ) -> None: diff --git a/tools/utils/gitea_inactive_developers.py b/tools/utils/gitea_inactive_developers.py index d9cad4cdf55..7e4d234c43b 100755 --- a/tools/utils/gitea_inactive_developers.py +++ b/tools/utils/gitea_inactive_developers.py @@ -40,6 +40,9 @@ from requests.structures import CaseInsensitiveDict logger = logging.getLogger(__file__) +GITEA_DOMAIN = "https://projects.blender.org/" + + @dc.dataclass class TeamMember(): id: int @@ -53,7 +56,7 @@ class TeamMember(): login=self.login, full_name=self.full_name, last_login=self.last_login, - url=gitea_domain + self.login, + url=GITEA_DOMAIN + self.login, ) @@ -215,23 +218,21 @@ def is_inactive(member: TeamMember) -> bool: return member.last_login < two_years_ago -teams = ( - "Developers", - "Add-ons", - "Translation", - "Documentation", - "Technical-Artists", - "Contributors", -) - - -api_token = os.environ['GITEA_API_TOKEN'] -gitea_domain = "https://projects.blender.org/" -api_url = yarl.URL(gitea_domain + 'api/v1/') -organization_name = "blender" - - def main() -> None: + + teams = ( + "Developers", + "Add-ons", + "Translation", + "Documentation", + "Technical-Artists", + "Contributors", + ) + + api_token = os.environ['GITEA_API_TOKEN'] + api_url = yarl.URL(GITEA_DOMAIN + 'api/v1/') + organization_name = "blender" + for team_name in teams: logger.warning(team_name) members = fetch_team_members(