Skip to content

Commit

Permalink
adjusting pkg for second submission 0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Reckziegel committed Feb 16, 2022
1 parent 4edaa4b commit 0a20a19
Show file tree
Hide file tree
Showing 31 changed files with 92 additions and 99 deletions.
16 changes: 7 additions & 9 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@

^.*\.Rproj$
^\.Rproj\.user$
^LICENSE\.md$
^README\.Rmd$
^\.travis\.yml$
^\.circleci$
^\.circleci/config\.yml$
^\.github$
^_pkgdown\.yml$
^docs$
^pkgdown$
^codecov\.yml$
^\.travis\.yml$
^appveyor\.yml$
^\.circleci$
^\.circleci/config\.yml$
^cran-comments\.md$
^revdep$
^CRAN-RELEASE$
^LICENSE\.md$
^README\.Rmd$
^codecov\.yml$
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
- checkout
- run:
name: Install package dependencies
no_output_timeout: 30m
command: |
mkdir -p ~/R/Library
Rscript -e 'install.packages("remotes")'
Expand Down
34 changes: 15 additions & 19 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches:
- main
- master
branches: [main, master]
pull_request:
branches:
- main
- master
branches: [main, master]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: macOS-latest
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- name: Install dependencies
run: |
install.packages(c("remotes", "rcmdcheck"))
remotes::install_deps(dependencies = TRUE)
shell: Rscript {0}
- name: Check
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "error")
shell: Rscript {0}
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: rcmdcheck

- uses: r-lib/actions/check-r-package@v1
40 changes: 30 additions & 10 deletions .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
@@ -1,55 +1,75 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
issue_comment:
types: [created]

name: Commands

jobs:
document:
if: startsWith(github.event.comment.body, '/document')
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
name: document
runs-on: macOS-latest
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/pr-fetch@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: r-lib/actions/setup-r@v1
- name: Install dependencies
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: roxygen2

- name: Document
run: Rscript -e 'roxygen2::roxygenise()'

- name: commit
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
git add man/\* NAMESPACE
git commit -m 'Document'
- uses: r-lib/actions/pr-push@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

style:
if: startsWith(github.event.comment.body, '/style')
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/style') }}
name: style
runs-on: macOS-latest
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/pr-fetch@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: r-lib/actions/setup-r@v1

- name: Install dependencies
run: Rscript -e 'install.packages("styler")'

- name: Style
run: Rscript -e 'styler::style_pkg()'

- name: commit
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
git add \*.R
git commit -m 'Style'
- uses: r-lib/actions/pr-push@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 4 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Imports:
magrittr (>= 2.0.2),
methods,
mvtnorm (>= 1.1-3),
NlcOptim (>= 0.6),
purrr (>= 0.3.4),
rlang (>= 1.0.1),
scales (>= 1.1.1),
Expand All @@ -33,18 +32,17 @@ Imports:
tibble (>= 3.1.6),
tidyr (>= 1.2.0),
vctrs (>= 0.3.8),
xts (>= 0.12.1),
nloptr (>= 2.0.0),
crayon (>= 1.5.0)
crayon,
NlcOptim (>= 0.6)
Suggests:
covr,
knitr (>= 1.37),
markdown,
roxygen2,
spelling,
testthat (>= 3.1.2)
VignetteBuilder:
knitr
testthat (>= 3.1.2),
xts (>= 0.12.1)
Config/testthat/edition: 3
Encoding: UTF-8
Language: en-US
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2020 Bernardo Reckziegel
Copyright (c) 2022 Bernardo Reckziegel

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 3 additions & 0 deletions R/cran_checks.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Suppress R CMD check note
# @importFrom xts xts
# @importFrom NlcOptim solnl
4 changes: 0 additions & 4 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,3 @@ check_input.tbl_df <- function(x) tbl_to_mtx(x)



# Test xts object ---------------------------------------------------------

#' @keywords internal
is_xts <- function(x) xts::is.xts(x)
4 changes: 2 additions & 2 deletions R/views.R
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ construct_view_on_volatility <- function(x, vol) {
#'
#' Helper to construct views on relative performance of assets.
#'
#' If `rank = c(2, 1)` then, it is implied that asset 1 will outperform asset 2.
#' For more asset the interpretation is the same: assets on the right will outperform
#' If `rank = c(2, 1)` it is implied that asset 1 will outperform asset 2.
#' For vectors of bigger size the interpretation is the same: assets on the right will outperform
#' assets on the left.
#'
#' @param x An univariate or a multivariate distribution.
Expand Down
4 changes: 1 addition & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![CRAN status](https://www.r-pkg.org/badges/version/ffp)](https://CRAN.R-project.org/package=ffp)
[![R-CMD-check](https://github.com/Reckziegel/FFP/workflows/R-CMD-check/badge.svg)](https://github.com/Reckziegel/FFP/actions)
<!-- [![Travis build status](https://www.travis-ci.com/Reckziegel/FFP.svg?branch=main)](https://www.travis-ci.com/Reckziegel/FFP) -->
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/Reckziegel/FFP?branch=main&svg=true)](https://ci.appveyor.com/project/Reckziegel/FFP)
[![Codecov test coverage](https://codecov.io/gh/Reckziegel/FFP/branch/main/graph/badge.svg)](https://app.codecov.io/gh/Reckziegel/FFP?branch=main)
[![CRAN status](https://www.r-pkg.org/badges/version/ffp)](https://CRAN.R-project.org/package=ffp)
[![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/ffp?color=blue)](https://r-pkg.org/pkg/ffp)
[![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/ffp?color=blue)](https://r-pkg.org/pkg/ffp)
<!-- badges: end -->
Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@

[![Lifecycle:
experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![CRAN
status](https://www.r-pkg.org/badges/version/ffp)](https://CRAN.R-project.org/package=ffp)
[![R-CMD-check](https://github.com/Reckziegel/FFP/workflows/R-CMD-check/badge.svg)](https://github.com/Reckziegel/FFP/actions)
<!-- [![Travis build status](https://www.travis-ci.com/Reckziegel/FFP.svg?branch=main)](https://www.travis-ci.com/Reckziegel/FFP) -->
[![AppVeyor build
status](https://ci.appveyor.com/api/projects/status/github/Reckziegel/FFP?branch=main&svg=true)](https://ci.appveyor.com/project/Reckziegel/FFP)
[![Codecov test
coverage](https://codecov.io/gh/Reckziegel/FFP/branch/main/graph/badge.svg)](https://app.codecov.io/gh/Reckziegel/FFP?branch=main)
[![CRAN
status](https://www.r-pkg.org/badges/version/ffp)](https://CRAN.R-project.org/package=ffp)
[![CRAN RStudio mirror
downloads](https://cranlogs.r-pkg.org/badges/last-month/ffp?color=blue)](https://r-pkg.org/pkg/ffp)
[![CRAN RStudio mirror
Expand Down
12 changes: 0 additions & 12 deletions cran-comments.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE.html

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

10 changes: 5 additions & 5 deletions docs/authors.html

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

6 changes: 3 additions & 3 deletions docs/index.html

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

4 changes: 2 additions & 2 deletions docs/news/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ pandoc: 2.11.4
pkgdown: 2.0.2
pkgdown_sha: ~
articles: {}
last_built: 2022-02-16T14:40Z
last_built: 2022-02-16T20:19Z

2 changes: 1 addition & 1 deletion docs/reference/DoubleDecay.html

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

Loading

0 comments on commit 0a20a19

Please sign in to comment.