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.

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

Linting, Part 2 #81

Merged
merged 61 commits into from
Sep 12, 2017
Merged

Conversation

AlexAxthelm
Copy link
Collaborator

More progress on #40. Unless, I've misunderstood, this should wrap up what can be done without merge conflicts before 4.1.0?

I've tried to be consistent with the changes that I made in #72, including keeping each function's lints as its own commits, to make git-blame a bit easier.

All checks pass on my local machine, but I expect coverage to drop, like last time.

Alex Axthelm added 29 commits August 30, 2017 09:32
The Generate tests were failing after I changed the lines with multiple
assignment statements (eg. `x = y = 5`) to be two lines. I had
previously tried to preserve the syntax, by assigning one object as
null, and then assigning the second object as the first, but this failed
because the first object didn't exist (NULL), so the second assignment
operation failed. Change to explicitly assign second object as NULL.
@codecov-io
Copy link

codecov-io commented Aug 30, 2017

Codecov Report

Merging #81 into master will decrease coverage by 1.47%.
The diff coverage is 95.68%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #81      +/-   ##
==========================================
- Coverage     100%   98.52%   -1.48%     
==========================================
  Files          35       35              
  Lines        1394     1631     +237     
==========================================
+ Hits         1394     1607     +213     
- Misses          0       24      +24
Impacted Files Coverage Δ
R/graph.R 100% <100%> (ø) ⬆️
R/timing.R 100% <100%> (ø) ⬆️
R/timestamp.R 100% <100%> (ø) ⬆️
R/outdated.R 100% <100%> (ø) ⬆️
R/find.R 87.5% <85.71%> (-12.5%) ⬇️
R/plan.R 89.47% <87.87%> (-10.53%) ⬇️
R/Makefile.R 90.24% <89.39%> (-9.76%) ⬇️
R/generate.R 95.08% <95.76%> (-4.92%) ⬇️
R/read.R 96.61% <96.22%> (-3.39%) ⬇️
R/make.R 97.95% <97.72%> (-2.05%) ⬇️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 57150e6...6e3500a. Read the comment docs.

@ropensci ropensci deleted a comment from lintr-bot Sep 11, 2017
@AlexAxthelm
Copy link
Collaborator Author

I think I've buttoned up the R/ directory. I'm currently working on the basic.R example, then I'll start on tests.

My plan for tests is to do a literal linting of what is currently there, and then go back through and supplement until coverage is back up to 100%.

Alex Axthelm added 3 commits September 11, 2017 14:20
@wlandau-lilly: please check this one extra carefully. I don't think I
changed anything structural, but as near as I can tell, there aren't an
actual unit test on this one.
@wlandau-lilly
Copy link
Collaborator

Looks that way to me. Definitely much improved.

                                        style warning error
inst/examples/basic/basic.R                54       0     0
tests/testthat/test-command-changes.R      13       0     0
tests/testthat/test-envir.R                26       0     0
tests/testthat/test-full-build.R           16       0     0
tests/testthat/test-generate.R             76       0     0
tests/testthat/test-import-object.R        18       0     0
tests/testthat/test-intermediate-file.R     7       0     0
tests/testthat/test-Makefile.R             35       0     0
tests/testthat/test-namespaced.R           17       0     0

If you rerun roxygen2 again, this may actually be a good time for an intermediate merge. Yes, code coverage will decrease for a little bit, but other people will be able work on PRs more easily in the meantime.

@AlexAxthelm
Copy link
Collaborator Author

I ran devtools::document(), and made a commit. I had done one of the testfiles before I pushed, so that's in there too.

I'm a bit nervous about touching them (which is why I'm doing it last), so if you could give them a second set of eyes, just to make sure that I don't drop any arguments or parens or such, I would appreciate it greatly.

@ropensci ropensci deleted a comment from lintr-bot Sep 11, 2017
@ropensci ropensci deleted a comment from lintr-bot Sep 11, 2017
@ropensci ropensci deleted a comment from lintr-bot Sep 11, 2017
@wlandau-lilly
Copy link
Collaborator

All my checks came out totally clear:

  • win-builder, all 3 R versions
  • basic.R, Windows 7, R-devel
  • basic.R, Red Hat Linux, R 3.4.0
  • basic.R with HPC enabled, Red Hat Linux, R 3.4.0
  • tests/extra/multiple.R, Windows 7, R-devel
  • tests/extra/multiple.R, Red Had Linux, R 3.4.0

I will merge your work so far to allow others to develop R/*.R without merge conflicts.

@wlandau-lilly wlandau-lilly merged commit f8d2687 into ropensci:master Sep 12, 2017
@AlexAxthelm AlexAxthelm deleted the linting-2-lint-harder branch September 12, 2017 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants