Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge conflicts #432

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Fix merge conflicts #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions ament_pep257/ament_pep257/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ def generate_pep257_report(paths, excludes, ignore):
report = []

files_dict = {}
<<<<<<< HEAD
if LooseVersion(pydocstyle.__version__) >= LooseVersion('2.0.0'):
for filename, checked_codes, ignore_decorators in files_to_check:
# Unpack 3 values for pydocstyle <= 6.1.1 and 4 values for pydocstyle >= 6.2.0
for filename, checked_codes, ignore_decorators, *_ in files_to_check:
if _filename_in_excludes(filename, excludes):
continue
files_dict[filename] = {
Expand All @@ -145,16 +145,6 @@ def generate_pep257_report(paths, excludes, ignore):
files_dict[filename] = {
'select': select,
}
=======
# Unpack 3 values for pydocstyle <= 6.1.1 and 4 values for pydocstyle >= 6.2.0
for filename, checked_codes, ignore_decorators, *_ in files_to_check:
if _filename_in_excludes(filename, excludes):
continue
files_dict[filename] = {
'select': checked_codes,
'ignore_decorators': ignore_decorators,
}
>>>>>>> ae431ed (Added underscore to ignore new pydocstyle item (#428))

for filename in sorted(files_dict.keys()):
print('checking', filename)
Expand Down