Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #123 from nuest/master
Browse files Browse the repository at this point in the history
fix warning during CRAN submission
  • Loading branch information
nuest authored Apr 11, 2019
2 parents 666a105 + 3083799 commit bf02aee
Show file tree
Hide file tree
Showing 14 changed files with 124 additions and 112 deletions.
6 changes: 3 additions & 3 deletions DEV-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,13 @@ A new release shall be uploaded to CRAN after testing and under the following pr
- Run **checks** again and fix all problems
- In the parent directory of the project: `R CMD build sos4R; R CMD check --as-cran sos4R_<version number>.tar.gz` should have no errors, warnings, or notes
- `revdepcheck::revdep_check()` for checking reverse dependencies
- `devtools::check_win_release()` and `devtools::devtools::check_win_devel()` for testing Windows using CRAN infrastructure
- `devtools::check_win_release()` and `devtools::check_win_devel()` for testing Windows using CRAN infrastructure
- `rhub::check_for_cran(email = <...>)` for testing for CRAN submissions using RHub infrastructure
- `rhub::check(email = <...>)` for running checks on different operating systems
- (optional) `rhub::check(email = <...>)` for running checks on different operating systems
- Regenerate the website with `pkgdown::build_site()` and re-knit `README.Rmd`, commit changes
- Push changes to `dev` branch
- Create a git tag with the version number using the letter `v` followed by the version number (see above, must match `DESCRIPTION`), e.g. `v1.2.3`, and push it to the main repository
- Read and follow http://cran.r-project.org/web/packages/policies.html and http://r-pkgs.had.co.nz/release.html#release-check again
- Read and follow http://cran.r-project.org/web/packages/policies.html and http://r-pkgs.had.co.nz/release.html#release-check again, make necessary changes
- Merge the PR

You can then do the actual release with
Expand Down
2 changes: 1 addition & 1 deletion R/SOS-methods-util.R
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ setMethod(f = "sosCapabilitiesUrl",
if (sos@verboseOutput) warning("Received ExceptionReport!")
.parsingFunction <- sosParsers(sos)[[owsExceptionReportName]]
.er <- .parsingFunction(obj)
if (class(.er) == "OwsExceptionReport")
if (any(class(.er) == "OwsExceptionReport"))
warning(toString(.er))
return(.er)
}
Expand Down
9 changes: 4 additions & 5 deletions docs/DEV-README.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bf02aee

Please sign in to comment.