Skip to content

Commit

Permalink
codebook, more lintr, corrected warning messages, move folders
Browse files Browse the repository at this point in the history
google
  • Loading branch information
ZauchnerP authored and Patricia Zauchner committed Sep 21, 2024
1 parent 13392cb commit 38f5d8b
Showing 345 changed files with 28,292 additions and 3,878 deletions.
95 changes: 95 additions & 0 deletions .github/workflows/rhub.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# R-hub's generic GitHub Actions workflow file. It's canonical location is at
# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
# You can update this file to a newer version using the rhub2 package:
#
# rhub::rhub_setup()
#
# It is unlikely that you need to modify this file manually.

name: R-hub
run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"

on:
workflow_dispatch:
inputs:
config:
description: 'A comma separated list of R-hub platforms to use.'
type: string
default: 'linux,windows,macos'
name:
description: 'Run name. You can leave this empty now.'
type: string
id:
description: 'Unique ID. You can leave this empty now.'
type: string

jobs:

setup:
runs-on: ubuntu-latest
outputs:
containers: ${{ steps.rhub-setup.outputs.containers }}
platforms: ${{ steps.rhub-setup.outputs.platforms }}

steps:
# NO NEED TO CHECKOUT HERE
- uses: r-hub/actions/setup@v1
with:
config: ${{ github.event.inputs.config }}
id: rhub-setup

linux-containers:
needs: setup
if: ${{ needs.setup.outputs.containers != '[]' }}
runs-on: ubuntu-latest
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.containers) }}
container:
image: ${{ matrix.config.container }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/run-check@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}

other-platforms:
needs: setup
if: ${{ needs.setup.outputs.platforms != '[]' }}
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.platforms) }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/setup-r@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/run-check@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
31 changes: 16 additions & 15 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
Package: gmoTree
Title: Get and Modify 'oTree' Data
Version: 1.1.0
Date: 2024-07-04
Version: 1.2.0-9000
Date: 2024-09-20
Authors@R:
person("Patricia F.", "Zauchner", , "patricia.zauchner@gmx.at", role = c("aut", "trl", "cre", "cph"),
comment = c(ORCID = "https://orcid.org/0000-0002-5938-1683"))
Description: Manage data from 'oTree' experiments. Import 'oTree' data
and clean them by using functions to deal with messy data,
dropouts, and other problematic cases. Create IDs, calculate the time,
transfer variables between app data frames, and delete sensitive
information. You can also check your experimental data before running
the experiment.
Information on 'oTree' is found in Chen, D. L.,
Schonger, M., & Wickens, C. (2016) <doi:10.1016/j.jbef.2015.12.001>.
Description: Efficiently manage and process data from 'oTree' experiments.
Import 'oTree' data and clean them by using
functions to deal with messy data, dropouts,
and other problematic cases. Create IDs, calculate the time, transfer
variables between app data frames, and delete sensitive information.
You can also check your experimental data before running the
experiment and automatically make a codebook for your oTree code.
Information on 'oTree' is found in Chen, D. L., Schonger, M., &
Wickens, C. (2016) <doi:10.1016/j.jbef.2015.12.001>.
License: GPL (>= 3)
URL: https://zauchnerp.github.io/gmoTree/,
https://github.com/ZauchnerP/gmoTree/
BugReports: https://github.com/ZauchnerP/gmoTree/issues/
URL: https://zauchnerp.github.io/gmoTree/, https://github.com/ZauchnerP/gmoTree/, https://github.com/ZauchnerP/gmoTree
BugReports: https://github.com/ZauchnerP/gmoTree/issues
Depends:
R (>= 4.4.0)
Imports:
data.table (>= 1.15.4),
dplyr (>= 1.1.4),
knitr (>= 1.47),
openxlsx (>= 4.2.5.2),
pander (>= 0.6.5),
plyr (>= 1.8.9),
rlang (>= 1.1.4),
rlist (>= 0.4.6.2),
rmarkdown (>= 2.27),
stats (>= 4.4.1),
stringr (>= 1.5.1)
Suggests:
knitr (>= 1.47),
rmarkdown (>= 2.27),
testthat (>= 3.2.1),
withr (>= 3.0.0)
VignetteBuilder:
7 changes: 7 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
export(apptime)
export(assignv)
export(assignv_to_aaw)
export(codebook)
export(delete_cases)
export(delete_dropouts)
export(delete_duplicate)
@@ -16,3 +17,9 @@ export(messy_time)
export(pagesec)
export(show_constant)
export(show_dropouts)
import(knitr)
import(pander)
import(rmarkdown)
import(stats)
import(stringr)
import(utils)
10 changes: 9 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
**Changes in CITATION file and NEWS file are not documented.**

# gmoTree 1.2.0

* New function
* ```codebook()```: Create a codebook for the oTree code
* Linted code (more readable)
* Minor changes in warning messages
* More tests and examples

# gmoTree 1.1.0

* Changes in functions
@@ -18,7 +26,7 @@

File names of the examples are now portable.

* Changes in functions:
* Changes in functions
* ```import_otree()```: Minor changes. Can also import portable file names now.

# gmoTree 0.0.3
Loading

0 comments on commit 38f5d8b

Please sign in to comment.