From 51b0213656f705792f1c5390808eaf4dda267f06 Mon Sep 17 00:00:00 2001 From: khaledlarbi Date: Wed, 19 Mar 2025 16:17:51 +0100 Subject: [PATCH 01/10] Change authors and maintainer. --- DESCRIPTION | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index dc22550..750548c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -7,9 +7,10 @@ Description: Provides user-friendly tools for calibration in survey sampling. 'icarus' features functions for calibration on tight bounds and penalized calibration. Version: 0.3.2 -Authors@R: c(person("Antoine Rebecq", role=c("aut","cre"), - email = "antoine.rebecq@m4x.org")) -Maintainer: Antoine Rebecq +Authors@R: c(person("Antoine Rebecq", role=c("aut"), email = "antoine.rebecq@m4x.org", comment = "Creator"), + person("Khaled", "Larbi", role = "cre", email = "khaled.larbi@insee.fr"), + person("Institut national de la statistique et des études économiques", role = "cph")) +Maintainer: Khaled Larbi Depends: R (>= 3.1.1) License: GPL-3 From 8514ef598b6c30a1357de78cca07a2e2ae5ddfe3 Mon Sep 17 00:00:00 2001 From: khaledlarbi Date: Wed, 19 Mar 2025 16:29:07 +0100 Subject: [PATCH 02/10] New minor version (new maintainer) --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 750548c..6669039 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Description: Provides user-friendly tools for calibration in survey sampling. 'icarus'. In addition to calibration (with linear, raking and logit methods), 'icarus' features functions for calibration on tight bounds and penalized calibration. -Version: 0.3.2 +Version: 0.3.3 Authors@R: c(person("Antoine Rebecq", role=c("aut"), email = "antoine.rebecq@m4x.org", comment = "Creator"), person("Khaled", "Larbi", role = "cre", email = "khaled.larbi@insee.fr"), person("Institut national de la statistique et des études économiques", role = "cph")) diff --git a/NEWS.md b/NEWS.md index 1120979..5477ebf 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# icarus 0.3.3 + +* New maintainer + # icarus 0.3.2 ## Bug fixes From 90baddbaf73628fd3ea309923c8a6770a79d678a Mon Sep 17 00:00:00 2001 From: khaledlarbi Date: Thu, 20 Mar 2025 14:12:06 +0100 Subject: [PATCH 03/10] Add GitHub action to check building on several platforms --- cran-comments.md | 2 +- icarus.Rproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index f4118c8..bc54e4d 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments * Ubuntu 20.04, R 4.3.0 -* win-builder (devel and release) +* win-builder (devel, release and oldrelease) ## R CMD check results There were no ERRORs or WARNINGs. diff --git a/icarus.Rproj b/icarus.Rproj index 21a4da0..4c0997d 100644 --- a/icarus.Rproj +++ b/icarus.Rproj @@ -1,4 +1,5 @@ Version: 1.0 +ProjectId: 4ba73e09-93ad-4a8f-a434-67d41d4eadcd RestoreWorkspace: Default SaveWorkspace: Default @@ -15,3 +16,4 @@ LaTeX: pdfLaTeX BuildType: Package PackageUseDevtools: Yes PackageInstallArgs: --no-multiarch --with-keep.source +PackageCheckArgs: --as-cran From b5678616c089b15e0d6c23cd423411f8bbf65272 Mon Sep 17 00:00:00 2001 From: khaledlarbi Date: Thu, 20 Mar 2025 14:12:06 +0100 Subject: [PATCH 04/10] Add GitHub action to check building on several platforms --- .github/.gitignore | 1 + .github/workflows/R-CMD-check.yaml | 49 ++++++++++++++++++++++++++++++ .gitignore | 1 - cran-comments.md | 2 +- icarus.Rproj | 2 ++ 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 .github/.gitignore create mode 100644 .github/workflows/R-CMD-check.yaml diff --git a/.github/.gitignore b/.github/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.github/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml new file mode 100644 index 0000000..52c2b27 --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,49 @@ +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples +# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help +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: macOS-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + + steps: + - uses: actions/checkout@v2 + + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true diff --git a/.gitignore b/.gitignore index 244599c..16dd970 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ ..Rcheck/ docs revdep/ -.github/ *.Rcheck/ \ No newline at end of file diff --git a/cran-comments.md b/cran-comments.md index f4118c8..bc54e4d 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments * Ubuntu 20.04, R 4.3.0 -* win-builder (devel and release) +* win-builder (devel, release and oldrelease) ## R CMD check results There were no ERRORs or WARNINGs. diff --git a/icarus.Rproj b/icarus.Rproj index 21a4da0..4c0997d 100644 --- a/icarus.Rproj +++ b/icarus.Rproj @@ -1,4 +1,5 @@ Version: 1.0 +ProjectId: 4ba73e09-93ad-4a8f-a434-67d41d4eadcd RestoreWorkspace: Default SaveWorkspace: Default @@ -15,3 +16,4 @@ LaTeX: pdfLaTeX BuildType: Package PackageUseDevtools: Yes PackageInstallArgs: --no-multiarch --with-keep.source +PackageCheckArgs: --as-cran From a2faecc8980400dde7177b2461ad411685915355 Mon Sep 17 00:00:00 2001 From: Khaled <45902413+khaledlarbi@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:22:56 +0100 Subject: [PATCH 05/10] Update R-CMD-check.yaml --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 52c2b27..4f83514 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -5,6 +5,7 @@ on: branches: [main, master] pull_request: branches: [main, master] + workflow_dispatch: name: R-CMD-check From cf0578e0de312caf72b6e88e136e491c16f4317e Mon Sep 17 00:00:00 2001 From: Khaled <45902413+khaledlarbi@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:57:18 +0100 Subject: [PATCH 06/10] Only workflow_dispatch on github action --- .github/workflows/R-CMD-check.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4f83514..cf89de4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,10 +1,6 @@ # Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: - push: - branches: [main, master] - pull_request: - branches: [main, master] workflow_dispatch: name: R-CMD-check From 46473f1975433c60aae63ffc5678d9670d0e2c69 Mon Sep 17 00:00:00 2001 From: Khaled <45902413+khaledlarbi@users.noreply.github.com> Date: Thu, 20 Mar 2025 15:04:46 +0100 Subject: [PATCH 07/10] Changing GitHub Action to trigger on pull request --- .github/workflows/R-CMD-check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index cf89de4..45e166e 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,7 +1,9 @@ # Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: - workflow_dispatch: + pull_request: + types: + - opened name: R-CMD-check From 33f68a64ecfd40ebcc35d92ba39828ca16ce4a8d Mon Sep 17 00:00:00 2001 From: khaledlarbi Date: Thu, 20 Mar 2025 15:23:25 +0100 Subject: [PATCH 08/10] Update `cran-comments.md` --- cran-comments.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index bc54e4d..923e708 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,18 +1,23 @@ ## Test environments -* Ubuntu 20.04, R 4.3.0 -* win-builder (devel, release and oldrelease) +* Linux Ubuntu: R-oldrelease, R-release and R-devel +* Windows: R-oldrelease, R-release and R-devel +* MacOS: R-release ## R CMD check results There were no ERRORs or WARNINGs. There was 1 NOTE: -* Possibly mis-spelled words in DESCRIPTION: - Reweights (2:23) - SAS (3:186) - logit (3:300) +``` +* checking CRAN incoming feasibility ... [10s] NOTE +Maintainer: 'Khaled Larbi ' + +New maintainer: + Khaled Larbi +Old maintainer(s): + Antoine Rebecq +``` - These words aren't mis-spelled and text in DESCRIPTION didn't change since last submission. ## Downstream dependencies From 4398eccbec5256af1e068edd0c015982a15601ae Mon Sep 17 00:00:00 2001 From: Khaled <45902413+khaledlarbi@users.noreply.github.com> Date: Wed, 6 Aug 2025 10:20:17 +0200 Subject: [PATCH 09/10] Enable manual and extended PR triggers for R-CMD-check --- .github/workflows/R-CMD-check.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 45e166e..5c4d199 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -4,6 +4,9 @@ on: pull_request: types: - opened + - synchronize + - reopened + workflow_dispatch: name: R-CMD-check From 440965dede81f0d3fe701cd867134d57832c7d20 Mon Sep 17 00:00:00 2001 From: klarbi Date: Fri, 5 Sep 2025 12:11:59 +0000 Subject: [PATCH 10/10] Skip test if `Rglpk` not installed --- tests/testthat/test_calibration_small_dataset.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test_calibration_small_dataset.R b/tests/testthat/test_calibration_small_dataset.R index 525c9a5..4e5257c 100644 --- a/tests/testthat/test_calibration_small_dataset.R +++ b/tests/testthat/test_calibration_small_dataset.R @@ -111,7 +111,7 @@ test_that("Penalized calibration checks out", { test_that("Calibration on minimum bounds checks out", { - + skip_if_not_installed("Rglpk") mar1 <- c("category",3,80,90,60) mar2 <- c("sex",2,140,90,0) mar3 <- c("department",2,100,130,0)