Merge branch 'master' into fix/readonlyadmin-cascade-delete

Author: UltraBot05

.github/actions/bot-autoassign/issue_assignment_bot.py

@@ -273,7 +273,7 @@ def handle_issue_comment(self):
         try:
             if self.event_payload.get("issue", {}).get("pull_request"):
                 print("Comment is on a PR, not an issue - skipping")
-                return False
+                return True
             comment = self.event_payload.get("comment", {})
             issue = self.event_payload.get("issue", {})
             comment_body = comment.get("body", "")
@@ -285,7 +285,7 @@ def handle_issue_comment(self):
             if self.is_assignment_request(comment_body):
                 return self.respond_to_assignment_request(issue_number, commenter)
             print("Comment does not contain assignment request")
-            return False
+            return True
         except Exception as e:
             print(f"Error handling issue comment: {e}")
             return False
@@ -308,10 +308,13 @@ def handle_pull_request(self):
                 # We consider the event handled even if no issues were linked
                 return True
             elif action == "closed":
-                self.unassign_issues_from_pr(pr_body, pr_author)
+                if pr.get("merged", False):
+                    print(f"PR #{pr_number} was merged, keeping issue assignments")
+                else:
+                    self.unassign_issues_from_pr(pr_body, pr_author)
                 return True
             print(f"PR action '{action}' not handled")
-            return False
+            return True
         except Exception as e:
             print(f"Error handling pull request: {e}")
             return False
@@ -328,7 +331,7 @@ def run(self):
                 return self.handle_pull_request()
             else:
                 print(f"Event type '{self.event_name}'" " not supported")
-                return False
+                return True
         except Exception as e:
             print(f"Error in main execution: {e}")
             return False

.github/actions/bot-autoassign/pr_reopen_bot.py

@@ -76,7 +76,7 @@ def handle_pr_reopen(self):
             print(f"Reassigned {len(reassigned)}" f" issues to {pr_author}")
             return True
         except Exception as e:
-            print(f"Error handling PR reopen: {e}")
+            print(f"Error handling reopened PR: {e}")
             return False
 
     def run(self):
@@ -89,7 +89,7 @@ def run(self):
                 return self.handle_pr_reopen()
             else:
                 print(f"Event type '{self.event_name}'" " not supported")
-                return False
+                return True
         except Exception as e:
             print(f"Error in main execution: {e}")
             return False
@@ -113,15 +113,15 @@ def handle_contributor_activity(self):
                 return False
             if not issue_data.get("pull_request"):
                 print("Comment is on an issue," " not a PR, skipping")
-                return False
+                return True
             pr = self.repo.get_pull(pr_number)
             if not pr.user or commenter != pr.user.login:
                 print("Comment not from PR author, skipping")
-                return False
+                return True
             labels = [label.name for label in pr.get_labels()]
             if "stale" not in labels:
                 print("PR is not stale, skipping")
-                return False
+                return True
             try:
                 pr.remove_from_labels("stale")
                 print("Removed stale label")
@@ -169,7 +169,7 @@ def run(self):
                 return self.handle_contributor_activity()
             else:
                 print(f"Event type '{self.event_name}'" " not supported")
-                return False
+                return True
         except Exception as e:
             print(f"Error in main execution: {e}")
             return False

.github/actions/bot-autoassign/stale_pr_bot.py

@@ -144,7 +144,7 @@ def unassign_linked_issues(self, pr):
     def close_stale_pr(self, pr, days_inactive):
         if pr.state == "closed":
             print(f"PR #{pr.number} is already closed, skipping")
-            return False
+            return True
         try:
             pr_author = pr.user.login if pr.user else None
             if not pr_author:

.github/actions/bot-autoassign/tests/test_issue_assignment_bot.py

@@ -291,7 +291,7 @@ def test_skip_pr_comment(self, bot_env):
                 },
             }
         )
-        assert not bot.handle_issue_comment()
+        assert bot.handle_issue_comment()
 
     def test_non_assignment_comment(self, bot_env):
         bot = IssueAssignmentBot()
@@ -304,7 +304,7 @@ def test_non_assignment_comment(self, bot_env):
                 },
             }
         )
-        assert not bot.handle_issue_comment()
+        assert bot.handle_issue_comment()
 
     def test_no_payload(self, bot_env):
         bot = IssueAssignmentBot()
@@ -373,6 +373,22 @@ def test_closed(self, bot_env):
         assert bot.handle_pull_request()
         mock_issue.remove_from_assignees.assert_called_once_with("testuser")
 
+    def test_merged_does_not_unassign(self, bot_env):
+        bot = IssueAssignmentBot()
+        bot.load_event_payload(
+            {
+                "action": "closed",
+                "pull_request": {
+                    "number": 100,
+                    "user": {"login": "testuser"},
+                    "body": "Fixes #123",
+                    "merged": True,
+                },
+            }
+        )
+        assert bot.handle_pull_request()
+        bot_env["repo"].get_issue.assert_not_called()
+
     def test_unsupported_action(self, bot_env):
         bot = IssueAssignmentBot()
         bot.load_event_payload(
@@ -385,7 +401,7 @@ def test_unsupported_action(self, bot_env):
                 },
             }
         )
-        assert not bot.handle_pull_request()
+        assert bot.handle_pull_request()
 
 
 class TestRun:
@@ -431,7 +447,7 @@ def test_pull_request_event(self, bot_env):
     def test_unsupported_event(self, bot_env):
         bot = IssueAssignmentBot()
         bot.event_name = "push"
-        assert not bot.run()
+        assert bot.run()
 
     def test_no_github_client(self, bot_env):
         bot = IssueAssignmentBot()

.github/actions/bot-autoassign/tests/test_pr_reopen_bot.py

@@ -108,7 +108,7 @@ def test_handle_pr_reopen_no_payload(self, bot_env):
     def test_run_unsupported_event(self, bot_env):
         bot = PRReopenBot()
         bot.event_name = "push"
-        assert not bot.run()
+        assert bot.run()
 
 
 class TestPRActivityBot:
@@ -160,7 +160,7 @@ def test_handle_contributor_activity_not_author(self, bot_env):
         mock_pr = Mock()
         mock_pr.user.login = "testuser"
         bot_env["repo"].get_pull.return_value = mock_pr
-        assert not bot.handle_contributor_activity()
+        assert bot.handle_contributor_activity()
 
     def test_handle_contributor_activity_pr_not_stale(self, bot_env):
         bot = PRActivityBot()
@@ -177,7 +177,7 @@ def test_handle_contributor_activity_pr_not_stale(self, bot_env):
         mock_pr.user.login = "testuser"
         mock_pr.get_labels.return_value = []
         bot_env["repo"].get_pull.return_value = mock_pr
-        assert not bot.handle_contributor_activity()
+        assert bot.handle_contributor_activity()
 
     def test_handle_contributor_activity_not_pr(self, bot_env):
         bot = PRActivityBot()
@@ -190,7 +190,7 @@ def test_handle_contributor_activity_not_pr(self, bot_env):
                 "comment": {"user": {"login": "testuser"}},
             }
         )
-        assert not bot.handle_contributor_activity()
+        assert bot.handle_contributor_activity()
 
     def test_handle_contributor_activity_no_payload(self, bot_env):
         bot = PRActivityBot()
@@ -199,4 +199,4 @@ def test_handle_contributor_activity_no_payload(self, bot_env):
     def test_run_unsupported_event(self, bot_env):
         bot = PRActivityBot()
         bot.event_name = "push"
-        assert not bot.run()
+        assert bot.run()

.github/actions/bot-autoassign/tests/test_stale_pr_bot.py

@@ -231,7 +231,7 @@ def test_already_closed(self, bot_env):
         bot = StalePRBot()
         mock_pr = Mock()
         mock_pr.state = "closed"
-        assert not bot.close_stale_pr(mock_pr, 60)
+        assert bot.close_stale_pr(mock_pr, 60)
         mock_pr.create_issue_comment.assert_not_called()
         mock_pr.edit.assert_not_called()
 

.github/actions/bot-changelog-generator/action.yml

@@ -0,0 +1,44 @@
+name: "OpenWISP Changelog Generator"
+description: "Analyzes a PR and generates a RestructuredText changelog entry suggestion"
+author: "OpenWISP"
+
+inputs:
+  github-token:
+    description: "GitHub token for API access"
+    required: true
+  gemini-api-key:
+    description: "Google Gemini API key"
+    required: true
+  pr-number:
+    description: "Pull request number to analyze"
+    required: true
+  repo-name:
+    description: "Repository name in format owner/repo"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+
+    - name: Install dependencies
+      shell: bash
+      run: pip install "openwisp-utils[github_actions] @ https://github.com/openwisp/openwisp-utils/archive/refs/heads/master.tar.gz"
+
+    - name: Generate changelog entry
+      id: generate
+      shell: bash
+      env:
+        PR_NUMBER: ${{ inputs.pr-number }}
+        REPO_NAME: ${{ inputs.repo-name }}
+        GITHUB_TOKEN: ${{ inputs.github-token }}
+        GEMINI_API_KEY: ${{ inputs.gemini-api-key }}
+      run: |
+        python ${{ github.action_path }}/generate_changelog.py
+
+branding:
+  icon: "file-text"
+  color: "orange"