Skip to content

Commit

Permalink
Merge pull request #24 from TanguyBarthelemy/master
Browse files Browse the repository at this point in the history
Bug with accent in colnames solved
  • Loading branch information
TanguyBarthelemy authored Aug 7, 2024
2 parents 6a82581 + 1acf5cf commit d8c5149
Show file tree
Hide file tree
Showing 140 changed files with 20,861 additions and 10,694 deletions.
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
50 changes: 50 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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]
release:
types: [published]
workflow_dispatch:

name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,7 @@ rsconnect/

# Hidden file from mac-os
.DS_Store

# produced README.html
README.html
docs
4 changes: 2 additions & 2 deletions .lintr
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ linters: linters_with_defaults(
indentation_linter(indent = 4L),
object_name_linter = NULL,
cyclocomp_linter = NULL,
line_length_linter = NULL,
commented_code_linter = NULL
commented_code_linter = NULL,
line_length_linter = NULL
)
encoding: "UTF-8"
31 changes: 17 additions & 14 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,36 @@ Type: Package
Title: Interface Between the 'JDemetra+' Cruncher and R, and Quality Report Generator
Version: 0.2.4
Authors@R: c(
person(given = "Alain",
family = "Quartier-la-Tente",
role = c("aut"),
email = "alain.quartier-la-tente@insee.fr"),
person(given = "Institut national de la statistique et des études économiques",
role = "cph",
comment = "https://www.insee.fr/"),
person(given = "Tanguy",
family = "Barthelemy", role = c("aut", "cre"),
family = "Barthelemy", role = c("aut", "cre", "art"),
email ="tanguy.barthelemy@insee.fr"),
person(given = "Alain",
family = "Quartier-la-Tente",
role = c("aut"),
email = "alain.quartier-la-tente@insee.fr",
comment = c(ORCID = "0000-0001-7890-3857")),
person(given = NULL,
family = "Institut national de la statistique et des études économiques",
role = "cph",
comment = "https://www.insee.fr/"),
person(given = "Anna",
family = "Smyk", role = c("aut"),
email ="anna.smyk@insee.fr"))
Description: R tools to enables the user to launch the 'JDemetra+' cruncher from R and to build complementary tools for seasonal adjustment
(generating quality reports and calculating series scores). The latest cruncher version can be downloaded here: <https://github.com/jdemetra/jwsacruncher/releases>.
URL: https://github.com/InseeFr/JDCruncheR
Description: Tool for generating quality reports from cruncher outputs (and calculating series scores). The latest version of the cruncher can be downloaded here: <https://github.com/jdemetra/jwsacruncher/releases>.
URL: https://github.com/InseeFr/JDCruncheR, https://inseefr.github.io/JDCruncheR/
BugReports: https://github.com/InseeFr/JDCruncheR/issues
Imports:
XML,
XLConnect (>= 1.0.0)
openxlsx,
stats,
utils
Suggests:
knitr,
kableExtra,
pkgdown,
rmarkdown
License: EUPL
VignetteBuilder: knitr
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
12 changes: 7 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ S3method(weighted_score,mQR_matrix)
export(QR_matrix)
export(add_indicator)
export(compute_score)
export(create_param_file)
export(cruncher)
export(cruncher_and_param)
export(export_xlsx)
export(extract_QR)
export(extract_score)
export(is.QR_matrix)
export(is.mQR_matrix)
export(mQR_matrix)
export(multiprocessing_names)
export(recode_indicator_num)
export(remove_indicators)
export(retain_indicators)
export(update_workspace)
export(weighted_score)
importFrom(openxlsx,addStyle)
importFrom(openxlsx,addWorksheet)
importFrom(openxlsx,conditionalFormatting)
importFrom(openxlsx,createStyle)
importFrom(openxlsx,createWorkbook)
importFrom(openxlsx,saveWorkbook)
importFrom(openxlsx,writeData)
importFrom(stats,sd)
importFrom(utils,read.csv)
11 changes: 10 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

* Update readme
* remove all functions related to cruncher


### Fixed

* resolve a bug
* resolve a bug linked to shell function
* resolve a bug related to accent colnames
* lintr is up-to-date


### Added

* Github Action to check the package


## [0.2.4] - 2022-07-27
Expand Down
Loading

0 comments on commit d8c5149

Please sign in to comment.