fix delint conflicts #687
Merged
fix delint conflicts #687
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AshesITR
commented
Dec 6, 2020
| @@ -1,6 +1,6 @@ | |||
| linters: with_defaults( # The following TODOs are part of an effort to have {lintr} lint-free (#584) | |||
| line_length_linter = line_length_linter(120), | |||
| cyclocomp_linter = cyclocomp_linter(29), # TODO reduce to 15 | |||
| cyclocomp_linter = cyclocomp_linter(30), # TODO reduce to 15 | |||
There was a problem hiding this comment.
#673 added 1 to the cyclocomp of lint().
To keep this separate from removing ~ 200 lints from tests/, I temporarily bump the limit here.
MichaelChirico
previously approved these changes
Dec 6, 2020
AshesITR
commented
Dec 6, 2020
| @@ -60,11 +60,6 @@ test_that("returns the correct linting", { | |||
| expected_message <- tryCatch(parse(text = "\\"), error = get_base_message) | |||
| expect_lint("\\", rex(expected_message)) | |||
|
|
|||
| # also try when LANGUAGE initially unset | |||
There was a problem hiding this comment.
This causes non-english locales to fail the test.
test-exclusions.R was not touched since it contains 3 calls (and will be split by #660)
Merged
|
@MichaelChirico can you re-approve? I had a merge conflict and test failure on non-english locale due to |
MichaelChirico
approved these changes
Dec 6, 2020
|
That |
|
Ah, the problem was that in hindsight, removing the update of |
|
OK, we'll add that back in the future |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately, some newly enabled linters had hits in
tests, so we aren't lint-free on master atm.