Fix/stats (#363)

* Fix deprecated method and gz branch

* Cleanup comments

* Update comments

* Add missing include

(cherry picked from commit 99271f8)

# Conflicts:
#	make_help_scripts/deploy_defines.py

make_help_scripts/create_pr_stats.py

@@ -15,7 +15,7 @@
 
 import requests
 import os
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import time
 
 def get_api_response(url):
@@ -633,7 +633,7 @@ def create_contributors_table_with_graph(contributors_stats, user_details, table
 
 def print_reviewers_stats(reviewers_stats):
   """
-  Prints the statistics of the reviewers.
+  Prints the statistics of the 10 reviewers with most finished reviews.
 
   Args:
     reviewers_stats (dict): A dictionary containing the statistics of the reviewers.
@@ -646,7 +646,7 @@ def print_reviewers_stats(reviewers_stats):
 
 def print_contributors_stats(contributors_stats):
   """
-  Prints the statistics of the contributors.
+  Prints the statistics of the 10 contributors with the most line changes.
 
   Args:
     contributors_stats (dict): A dictionary containing the statistics of the contributors.
@@ -685,7 +685,7 @@ def print_contributors_stats(contributors_stats):
   "control_msgs": "master",
   "control.ros.org": "master",
   "gazebo_ros2_control": "master",
-  "gz_ros2_control": "master",
+  "gz_ros2_control": "rolling",
   "kinematics_interface": "master",
   "ros2_control_ci": "master",
   "ros2_rhel": "main",
@@ -696,7 +696,7 @@ def print_contributors_stats(contributors_stats):
 blacklist = ["dependabot[bot]", "mergify[bot]"]
 
 # Get the current date and time
-current_date = datetime.utcnow()
+current_date = datetime.now(timezone.utc)
 
 # Calculate one year ago from the current date
 one_year_ago = current_date - timedelta(days=365)

make_help_scripts/deploy_defines.py

@@ -63,7 +63,12 @@ def add_pr_stats_file():
     "galactic": "galactic",
     base_branch: "humble",
     "iron": "iron",
+<<<<<<< HEAD
     "master": "rolling"  # master is rolling, PRs are tested on rolling
+=======
+    "jazzy": "jazzy",
+    base_branch: "rolling"  # PRs are tested on rolling
+>>>>>>> 99271f8 (Fix/stats (#363))
 }
 
 # the subrepos which are cloned into the branches and, optionally, their corresponding PR for checkout
@@ -77,7 +82,12 @@ def add_pr_stats_file():
             "galactic": "galactic",
             "humble": "humble",
             "iron": "iron",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": os.environ.get('ROS2_CONTROL_PR')
     },
@@ -88,7 +98,12 @@ def add_pr_stats_file():
             "galactic": "galactic",
             "humble": "humble",
             "iron": "iron",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": os.environ.get('ROS2_CONTROLLERS_PR')
     },
@@ -99,7 +114,12 @@ def add_pr_stats_file():
             "galactic": "galactic",
             "humble": "humble",
             "iron": "iron",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": os.environ.get('ROS2_CONTROL_DEMOS_PR')
     },
@@ -110,7 +130,12 @@ def add_pr_stats_file():
             "galactic": "galactic",
             "humble": "humble",
             "iron": "iron",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": os.environ.get('GAZEBO_ROS2_CONTROL_PR')
     },
@@ -132,7 +157,12 @@ def add_pr_stats_file():
             "galactic": "ros2-master",
             "humble": "ros2-master",
             "iron": "ros2-master",
+<<<<<<< HEAD
             "rolling": "ros2-master"  # master is rolling
+=======
+            "jazzy": "ros2-master",
+            "rolling": "ros2-master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": None
     },
@@ -143,7 +173,12 @@ def add_pr_stats_file():
             "galactic": "galactic-devel",
             "humble": "humble",
             "iron": "master",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": None
     },
@@ -154,7 +189,12 @@ def add_pr_stats_file():
             "galactic": "master",
             "humble": "master",
             "iron": "master",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": None
     },
@@ -165,7 +205,12 @@ def add_pr_stats_file():
             "galactic": "humble",
             "humble": "humble",
             "iron": "master",
+<<<<<<< HEAD
             "rolling": "master"  # master is rolling
+=======
+            "jazzy": "master",
+            "rolling": "master"
+>>>>>>> 99271f8 (Fix/stats (#363))
         },
         "pr": None
     }