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..5c4d199 --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,51 @@ +# 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: + pull_request: + types: + - opened + - synchronize + - reopened + workflow_dispatch: + +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/DESCRIPTION b/DESCRIPTION index dc22550..6669039 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,10 +6,11 @@ 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 -Authors@R: c(person("Antoine Rebecq", role=c("aut","cre"), - email = "antoine.rebecq@m4x.org")) -Maintainer: Antoine Rebecq +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")) +Maintainer: Khaled Larbi Depends: R (>= 3.1.1) License: GPL-3 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 diff --git a/cran-comments.md b/cran-comments.md index f4118c8..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 and release) +* 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 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 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)