Merge ~mertkirpici/charm-rsyslog-forwarder-ha:lp/1998094 into charm-rsyslog-forwarder-ha:master

Proposed by Mert Kirpici
Status: Merged
Approved by: Eric Chen
Approved revision: bae8df6d452775a206d28db2eb7f228ff23bf17f
Merged at revision: f3e1f4c87b4270a68acbdcfa7adcac74cbe72b07
Proposed branch: ~mertkirpici/charm-rsyslog-forwarder-ha:lp/1998094
Merge into: charm-rsyslog-forwarder-ha:master
Diff against target: 17 lines (+4/-2)
1 file modified
tox.ini (+4/-2)
Reviewer Review Type Date Requested Status
Ramesh Sattaru (community) Approve
prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+433726@code.launchpad.net

Commit message

Close LP #1998094

Description of the change

flake8 6.0.0 does not like it when the inline comments are on the same
line as the ignored rule.

To post a comment you must log in.
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ramesh Sattaru (rameshcan) wrote :

As discussed, can you please check the feasibility of fixing the warnings

review: Needs Fixing
Revision history for this message
Mert Kirpici (mertkirpici) wrote :

> As discussed, can you please check the feasibility of fixing the warnings

Yes, will do that. Marking as WIP for now.

Revision history for this message
Mert Kirpici (mertkirpici) wrote :

As discussed, we are leaving the handling of TODO items for the future. So this MP is good to go.

Revision history for this message
Ramesh Sattaru (rameshcan) :
review: Approve
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f3e1f4c87b4270a68acbdcfa7adcac74cbe72b07

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tox.ini b/tox.ini
2index 4c8edb9..96ec0ba 100644
3--- a/tox.ini
4+++ b/tox.ini
5@@ -46,8 +46,10 @@ deps =
6
7 [flake8]
8 ignore =
9- D102 #TODO Missing docstring in public method
10- D103 #TODO Missing docstring in public function
11+ #TODO Missing docstring in public method
12+ D102
13+ #TODO Missing docstring in public function
14+ D103
15 exclude =
16 .git,
17 __pycache__,

Subscribers

People subscribed via source and target branches

to all changes: