diff --git a/make_help_scripts/create_pr_stats.py b/make_help_scripts/create_pr_stats.py index 2e3df9f2697..6cab4fa0dc1 100644 --- a/make_help_scripts/create_pr_stats.py +++ b/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) diff --git a/make_help_scripts/deploy_defines.py b/make_help_scripts/deploy_defines.py index 3f91233f822..cca668b2b6c 100644 --- a/make_help_scripts/deploy_defines.py +++ b/make_help_scripts/deploy_defines.py @@ -63,7 +63,9 @@ def add_pr_stats_file(): "galactic": "galactic", "humble": "humble", "iron": "iron", - base_branch: "jazzy" + "jazzy": "jazzy", + base_branch: "jazzy", # PRs are tested on jazzy + "master": "rolling" } # the subrepos which are cloned into the branches and, optionally, their corresponding PR for checkout @@ -78,7 +80,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "iron", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": os.environ.get('ROS2_CONTROL_PR') }, @@ -90,7 +92,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "iron", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": os.environ.get('ROS2_CONTROLLERS_PR') }, @@ -102,7 +104,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "iron", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": os.environ.get('ROS2_CONTROL_DEMOS_PR') }, @@ -114,7 +116,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "iron", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": os.environ.get('GAZEBO_ROS2_CONTROL_PR') }, @@ -138,7 +140,7 @@ def add_pr_stats_file(): "humble": "ros2-master", "iron": "ros2-master", "jazzy": "ros2-master", - "rolling": "ros2-master" # master is rolling + "rolling": "ros2-master" }, "pr": None }, @@ -150,7 +152,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "master", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": None }, @@ -162,7 +164,7 @@ def add_pr_stats_file(): "humble": "master", "iron": "master", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": None }, @@ -174,7 +176,7 @@ def add_pr_stats_file(): "humble": "humble", "iron": "master", "jazzy": "master", - "rolling": "master" # master is rolling + "rolling": "master" }, "pr": None }