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

Update readme and no linting on error #37

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

^.*\.Rproj$
^\.Rproj\.user$

Expand All @@ -6,6 +7,7 @@

^README\.Rmd$
^README-.*\.png$
^README\.html$

^Meta$
^docs$
Expand All @@ -24,4 +26,19 @@ cran-comments.md

^revdep$
^reconf\.sh$

^pom\.xml$

^CITATION\.cff$
^LICENSE.md$

^\.httr-oauth$
^\.zenodo\.json$

^checklist.yml$
^codecov\.yml$
^data-raw$
^dev$

^man-roxygen$
^organisation.yml$
7 changes: 5 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::lintr, local::.
extra-packages: |
any::cyclocomp
any::lintr
local::.
needs: lint

- name: Lint
run: lintr::lint_package()
shell: Rscript {0}
env:
LINTR_ERROR_ON_LINT: true
LINTR_ERROR_ON_LINT: false
8 changes: 8 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ jobs:
extra-packages: any::pkgdown, local::.
needs: website

- name: Update NEWS.md with package name and version
run: |
PACKAGE_NAME=$(grep -E '^Package:' DESCRIPTION | awk '{print $2}')
VERSION=$(grep -E '^Version:' DESCRIPTION | awk '{print $2}')
sed -i '1{/^# Changelog$/d}' NEWS.md
sed -i "1s/^/# ${PACKAGE_NAME} ${VERSION}\n\n/" NEWS.md
shell: bash

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}
Expand Down
14 changes: 9 additions & 5 deletions .lintr
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
linters: lintr::all_linters(
indentation_linter = NULL,
# line_length_linter = lintr::line_length_linter(80L),
line_length_linter = lintr::line_length_linter(500L),
trailing_blank_lines_linter = NULL,
trailing_whitespace_linter = NULL,
assignment_linter = NULL,
Expand All @@ -20,10 +22,7 @@ linters: lintr::all_linters(
cyclocomp_linter = NULL,
object_usage_linter = NULL,
object_name_linter = NULL,
# line_length_linter = lintr::line_length_linter(80L),
line_length_linter = lintr::line_length_linter(200L),
commented_code_linter = NULL,
extraction_operator_linter = NULL,
undesirable_function_linter = NULL,
nonportable_path_linter = NULL,
implicit_integer_linter = NULL,
Expand All @@ -42,13 +41,18 @@ linters: lintr::all_linters(
paste_linter = NULL,
unnecessary_lambda_linter = NULL,
function_argument_linter = NULL,
line_length_linter = NULL,
if_not_else_linter = NULL,
unnecessary_lambda_linter = NULL,
boolean_arithmetic_linter = NULL,
condition_message_linter = NULL,
undesirable_operator_linter = NULL,
nested_ifelse_linter = NULL,
unnecessary_nested_if_linter = NULL
unnecessary_nested_if_linter = NULL,
return_linter = NULL,
object_overwrite_linter = NULL,
condition_call_linter = NULL,
rep_len_linter = NULL,
if_switch_linter = NULL,
unnecessary_nesting_linter = NULL
)
encoding: "UTF-8"
3 changes: 2 additions & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![CRAN status](https://www.r-pkg.org/badges/version/rjd3highfreq)](https://CRAN.R-project.org/package=rjd3highfreq)
[![Mentioned in Awesome Official Statistics ](https://awesome.re/mentioned-badge.svg)](http://www.awesomeofficialstatistics.org)

[![R-CMD-check](https://github.com/rjdverse/rjd3highfreq/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rjdverse/rjd3highfreq/actions/workflows/R-CMD-check.yaml)
[![lint](https://github.com/rjdverse/rjd3highfreq/actions/workflows/lint.yaml/badge.svg)](https://github.com/rjdverse/rjd3highfreq/actions/workflows/lint.yaml)
Expand Down Expand Up @@ -215,4 +216,4 @@ pull requests should include **updated tests** and **updated documentation**. If

## Licensing

The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
The code of this project is licensed under the [European Union Public Licence (EUPL)](https://interoperable-europe.ec.europa.eu:443/collection/eupl/eupl-text-eupl-12).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ should be added or updated.

The code of this project is licensed under the [European Union Public
Licence
(EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
(EUPL)](https://interoperable-europe.ec.europa.eu:443/collection/eupl/eupl-text-eupl-12).
1 change: 1 addition & 0 deletions rjd3highfreq.Rproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Version: 1.0
ProjectId: 9ab0183a-a0fe-4009-9284-9fc87e183b51

RestoreWorkspace: No
SaveWorkspace: No
Expand Down
Loading