Skip to content

Commit

Permalink
Upgrade to 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcarayon committed Dec 10, 2020
1 parent 9596e54 commit f89f82d
Show file tree
Hide file tree
Showing 149 changed files with 8,084 additions and 6,633 deletions.
10 changes: 7 additions & 3 deletions .Rbuildignore
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
^.*\.Rproj$
^IDEATools\.Rproj$
^\.Rproj\.user$
^README\.Rmd$
^LICENSE\.md$
^_pkgdown\.yml$
^doc$
^Meta$
^README\.Rmd$
^docs$
^_pkgdown\.yml$
^\.github$
^codecov\.yml$
^pkgdown$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
84 changes: 84 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# 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
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

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

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
48 changes: 48 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: test-coverage

jobs:
test-coverage:
runs-on: macOS-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

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

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

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Cache R packages
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install dependencies
run: |
install.packages(c("remotes"))
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("covr")
shell: Rscript {0}

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}
5 changes: 3 additions & 2 deletions .gitignore
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
inst/doc
doc
Meta
docs
51 changes: 28 additions & 23 deletions DESCRIPTION
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
Package: IDEATools
Type: Package
Title: Ressources et outils pour le traitement de données IDEA4 sous R
Version: 1.1
Authors@R: c(
person("David", "Carayon", email = "[email protected]", role = c("aut", "cre")))
Maintainer: David Carayon <[email protected]>
Description: L'objectif du package IDEATools est de proposer des outils et ressources mobilisables sous R afin de manipuler des données issues d'enquêtes réalisées dans le cadre de la méthode IDEA4, notamment les restitutions graphiques en lien avec l'approche par les propriétés de la durabilité. Ce package est également le support d'un applicatif interactif web basé sur la librairie "Shiny", destiné à proposer une interface simple et intuitive à tout utilisateur non inité à R.
License: GPL-3
Depends: R (>= 2.10)
Title: A Collection of Tools Dedicated to the IDEA4 Method
Version: 2.0
Authors@R:
person(given = "David",
family = "Carayon",
role = c("aut", "cre"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-0217-2175"))
Description: IDEATools is an R package that provides tools to automate the processing of data collected as part of IDEA 4 diagnostics. Starting from the original data collecting files (xls, xlsx, json) this packages provides functions to compute IDEA indicators, draw modern and aesthetic plots, and produce a wide range of reporting materials.
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.1
Imports:
dplyr,
ggplot2,
magrittr,
janitor,
purrr,
readr,
readxl,
jsonlite,
readxl,
stringr,
stringi,
tibble,
tidyr,
magrittr,
rsvg,
glue,
ggpubr,
rmarkdown,
knitr,
openxlsx,
ggrepel,
purrr,
ggimage,
pdftools,
ggpubr,
ggplot2,
glue,
cli,
officer,
rsvg,
rmarkdown,
knitr,
ggrepel
License: GPL-3
Depends:
R (>= 2.10)
VignetteBuilder: knitr
Suggests:
covr,
pagedown,
officedown,
pagedown
openxlsx
8 changes: 5 additions & 3 deletions IDEATools.Rproj
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
RestoreWorkspace: No
SaveWorkspace: No
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
Expand All @@ -10,11 +10,13 @@ NumSpacesForTab: 2
Encoding: UTF-8

RnwWeave: Sweave
LaTeX: pdfLaTeX
LaTeX: XeLaTeX

AutoAppendNewline: Yes
StripTrailingWhitespace: Yes
LineEndingConversion: Posix

BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
PackageRoxygenize: rd,collate,namespace
4 changes: 2 additions & 2 deletions LICENSE.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ and each file should have at least the “copyright” line and a pointer to
where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 2020 David CARAYON
Copyright (C) 2020 David Carayon

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -573,7 +573,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short notice like this
when it starts in an interactive mode:

IDEATools Copyright (C) 2020 David CARAYON
IDEATools Copyright (C) 2020 David Carayon
This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type 'show c' for details.
Expand Down
Loading

0 comments on commit f89f82d

Please sign in to comment.