Refactor and update datetime deprecations

Author: hugovk

generate.py

@@ -9,14 +9,7 @@
 )
 
 
-def main(to_chart=360, versions=["2.6"]):
-    packages = remove_irrelevant_packages(get_top_packages(), to_chart)
-    annotate_support(packages, versions)
-    save_to_file(packages, "results.json")
-    generate_svg_wheel(packages, to_chart, versions)
-
-
-if __name__ == "__main__":
+def main() -> None:
     parser = argparse.ArgumentParser(
         description="Generate", formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
@@ -32,4 +25,11 @@ def main(to_chart=360, versions=["2.6"]):
     )
     args = parser.parse_args()
 
-    main(args.number, args.version)
+    packages = remove_irrelevant_packages(get_top_packages(), args.number)
+    annotate_support(packages, args.version)
+    save_to_file(packages, "results.json")
+    generate_svg_wheel(packages, args.number, args.version)
+
+
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.black]
-target_version = [ "py39" ]
+target_version = [ "py310" ]
 
 [tool.ruff]
 fix = true
@@ -8,7 +8,7 @@ lint.select = [
   "C4",     # flake8-comprehensions
   "E",      # pycodestyle errors
   "EM",     # flake8-errmsg
-  "F",      # pyflakes errors
+  "F",      # pyflakes
   "I",      # isort
   "ICN",    # flake8-import-conventions
   "ISC",    # flake8-implicit-str-concat

template.py

@@ -136,7 +136,7 @@ def get_eols() -> dict:
     return {version["cycle"]: version["eol"] for version in data}
 
 
-if __name__ == "__main__":
+def main() -> None:
     parser = argparse.ArgumentParser(
         description="Template", formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
@@ -156,7 +156,7 @@ def get_eols() -> dict:
         # Read it
         src = Template(infile.read())
 
-        now = dt.datetime.utcnow()
+        now = dt.datetime.now(dt.UTC).replace(tzinfo=None)
         for version in args.version:
             # Document data
             print(version)
@@ -207,3 +207,7 @@ def get_eols() -> dict:
             create_dir(version)
             with open(outfile, "w") as f:
                 f.write(result)
+
+
+if __name__ == "__main__":
+    main()

utils.py

@@ -144,7 +144,7 @@ def classifiers_support(classifiers, version):
     return "maybe"
 
 
-def annotate_support(packages, versions=["2.6"]):
+def annotate_support(packages, versions=("2.6",)):
     print("Getting support data...")
     num_packages = len(packages)
     for index, package in enumerate(packages):
@@ -218,7 +218,7 @@ def remove_irrelevant_packages(packages, limit):
 
 
 def save_to_file(packages, file_name):
-    now = dt.datetime.utcnow().replace(tzinfo=ZoneInfo("UTC"))
+    now = dt.datetime.now(ZoneInfo("UTC"))
     with open(file_name, "w") as f:
         f.write(
             json.dumps(