From cf626c714f05ee9f452d88fb1336dc3d9aed1100 Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Wed, 9 Apr 2025 06:30:50 +0200 Subject: [PATCH 1/3] update version in DESCRIPTION and NEWS --- DESCRIPTION | 2 +- NEWS.md | 2 +- docker/Makefile | 2 +- docker/docker-compose.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e190892..953a312 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: simTool Type: Package Title: Conduct Simulation Studies with a Minimal Amount of Source Code -Version: 1.1.7.9000 +Version: 1.1.8 Authors@R: person("Marsel", "Scheer", role = c("aut", "cre"), email = "scheer@freescience.de") Maintainer: Marsel Scheer Description: Tool for statistical simulations that have two components. diff --git a/NEWS.md b/NEWS.md index bc1bde2..4b19ee0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ -Version 1.1.7.9000 +Version 1.1.8 ========================= * Upcoming R-version does not allow to apply attr() to primitives to assign values. Fix this by decorating primitives if they are used. diff --git a/docker/Makefile b/docker/Makefile index a508a46..df2ca58 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -31,7 +31,7 @@ start-docker: .env shell-docker: @echo -------------------- $@ $$(date) -------------------- - sudo docker exec -it ide /bin/sh -c "/bin/bash && su -l rstudio" || { exit 1; } + sudo docker exec -u rstudio -it ide /bin/sh -c "/bin/bash" || { exit 1; } echo echo "Docker container is running..." diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 1d8bf7c..d867a53 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -24,7 +24,7 @@ services: - 8787:8787 ollama: container_name: ollama - image: ollama/ollama:0.5.7 + image: ollama/ollama:0.6.4 ports: - 11434:11434 volumes: From c965af6e82256234f5ed1d2bd13c10d0cf5e00bd Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Wed, 9 Apr 2025 07:25:41 +0200 Subject: [PATCH 2/3] correct/rm URLs according to cran checks on CRAN after submission --- DESCRIPTION | 2 +- README.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 953a312..3562423 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,5 +35,5 @@ Suggests: License: GPL-3 VignetteBuilder: knitr RoxygenNote: 7.3.2 -URL: http://MarselScheer.github.io/simTool +URL: https://marselscheer.github.io/simTool/ BugReports: https://github.com/MarselScheer/simTool/issues diff --git a/README.md b/README.md index 094c0c8..d1ee4b9 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions) -[![Coverage -Status](https://img.shields.io/codecov/c/github/MarselScheer/simTool/develop.svg)](https://codecov.io/github/MarselScheer/simTool?branch=develop) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Project Status: Active – The project has reached a stable, usable state and is being actively From c40ee8668a4002ed601ee1222de92d0b2e530acd Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Thu, 10 Apr 2025 20:15:26 +0200 Subject: [PATCH 3/3] update version number for next dev-cycle. fix badge url to codecov --- DESCRIPTION | 2 +- NEWS.md | 5 +++++ README.Rmd | 2 +- README.md | 7 ++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3562423..2faa57b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: simTool Type: Package Title: Conduct Simulation Studies with a Minimal Amount of Source Code -Version: 1.1.8 +Version: 1.1.8.9000 Authors@R: person("Marsel", "Scheer", role = c("aut", "cre"), email = "scheer@freescience.de") Maintainer: Marsel Scheer Description: Tool for statistical simulations that have two components. diff --git a/NEWS.md b/NEWS.md index 4b19ee0..c282315 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ +Version 1.1.8.9000 +========================= + +* placeholder for next development-cycle + Version 1.1.8 ========================= diff --git a/README.Rmd b/README.Rmd index b019cdf..5a4431d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -14,7 +14,7 @@ knitr::opts_chunk$set( [![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions) -[![Coverage Status](https://img.shields.io/codecov/c/github/MarselScheer/simTool/develop.svg)](https://codecov.io/github/MarselScheer/simTool?branch=develop) +[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Project Status: Active – The project has reached a stable, usable state and is being actively diff --git a/README.md b/README.md index d1ee4b9..3f2c793 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions) +[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Project Status: Active – The project has reached a stable, usable state and is being actively @@ -63,9 +64,9 @@ using confidence levels 0.8, 0.9, 0.95 are applied. This is repeated #> Number of data generating functions: 4 #> Number of analyzing procedures: 3 #> Number of replications: 1000 - #> Estimated replications per hour: 1318457 - #> Start of the simulation: 2025-04-05 05:37:59.800157 - #> End of the simulation: 2025-04-05 05:38:02.530619 + #> Estimated replications per hour: 1329200 + #> Start of the simulation: 2025-04-10 18:09:19.481191 + #> End of the simulation: 2025-04-10 18:09:22.189585 ## Installation