diff --git a/.github/workflows/revdep.yaml b/.github/workflows/revdep.yaml deleted file mode 100644 index 4cb89cc84..000000000 --- a/.github/workflows/revdep.yaml +++ /dev/null @@ -1,96 +0,0 @@ -# revdep check - -name: revdep -on: [workflow_dispatch] - -jobs: - revdep: - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - - strategy: - fail-fast: false - matrix: - config: - - {os: ubuntu-20.04, r: 'release'} - - env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - if: "!contains(github.event.head_commit.message, 'revdepcheck run - No changes to commit')" - steps: - - - uses: actions/checkout@v4 - - - 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 - - - - name: Query dependencies - run: | - install.packages('remotes') - saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} - - - name: Restore R package cache - uses: actions/cache@v4 - with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- - - - name: Install system dependencies - if: runner.os == 'Linux' - run: | - while read -r cmd - do - eval sudo $cmd - done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))') - - - name: Install dependencies - run: | - remotes::install_deps(dependencies = TRUE) - remotes::install_cran("rcmdcheck") - remotes::install_github("r-lib/revdepcheck") - shell: Rscript {0} - - - name: Session info - run: | - options(width = 100) - pkgs <- installed.packages()[, "Package"] - sessioninfo::session_info(pkgs, include_base = TRUE) - shell: Rscript {0} - - - name: Run revdepcheck - run: | - revdepcheck::revdep_reset() - revdepcheck::revdep_check(num_workers = 4, env = revdepcheck::revdep_env_vars(force_suggests = TRUE)) - revdepcheck::revdep_report() - revdepcheck::revdep_report_summary() - shell: Rscript {0} - - - name: Commit results - run: | - git config --local user.email "actions@github.com" - git config --local user.name "GitHub Actions" - git add revdep/README.md - git add revdep/problems.md - git add revdep/failures.md - git add revdep/cran.md - git commit -m "revdepcheck run - No changes to commit" || echo "No changes to commit" - git push origin || echo "No changes to commit" - - - name: Upload check results - uses: actions/upload-artifact@v4 - with: - name: ${{ runner.os }}-r${{ matrix.config.r }}-results - path: revdep/ diff --git a/.lintr b/.lintr index 470b37015..1fe605d52 100644 --- a/.lintr +++ b/.lintr @@ -14,6 +14,7 @@ exclusions: list( "vignettes/openxlsx2_basic_manual.R", "vignettes/openxlsx2_charts_manual.R", "vignettes/openxlsx2_formulas_manual.R", + "vignettes/openxlsx2_read_to_df.R", "vignettes/openxlsx2_style_manual.R", "vignettes/Update-from-openxlsx.R" ) diff --git a/DESCRIPTION b/DESCRIPTION index 6e90193cd..dec8d1eec 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: openxlsx2 Title: Read, Write and Edit 'xlsx' Files -Version: 1.6.0.9000 +Version: 1.7 Language: en-US Authors@R: c( person("Jordan Mark", "Barbone", email = "jmbarbone@gmail.com", role = "aut", comment = c(ORCID = "0000-0001-9788-3628")), diff --git a/NEWS.md b/NEWS.md index ec6cb5c1a..4fc7072df 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# openxlsx2 (development version) +# openxlsx2 1.7 ## New features diff --git a/inst/WORDLIST b/inst/WORDLIST index 025632539..7ecf733a2 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -170,6 +170,7 @@ mmm mmss mschart nestings +nopipe notBetween notEqual numFmt diff --git a/revdep/.gitignore b/revdep/.gitignore deleted file mode 100644 index 0371c7514..000000000 --- a/revdep/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -library -checks -checks.noindex -library.noindex -data.sqlite -*.html diff --git a/revdep/README.md b/revdep/README.md deleted file mode 100644 index 905fc602f..000000000 --- a/revdep/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Platform - -|field |value | -|:--------|:------------------------------------------------------| -|version |R version 4.3.3 (2024-02-29) | -|os |Ubuntu 20.04.6 LTS | -|system |x86_64, linux-gnu | -|ui |X11 | -|language |(EN) | -|collate |C.UTF-8 | -|ctype |C.UTF-8 | -|tz |UTC | -|date |2024-03-26 | -|pandoc |3.1.11 @ /opt/hostedtoolcache/pandoc/3.1.11/x64/pandoc | - -# Dependencies - -|package |old |new |Δ | -|:---------|:------|:------|:--| -|openxlsx2 |1.4 |1.5 |* | -|magrittr |2.0.3 |2.0.3 | | -|R6 |2.5.1 |2.5.1 | | -|Rcpp |1.0.12 |1.0.12 | | -|stringi |1.8.3 |1.8.3 | | -|zip |2.3.1 |2.3.1 | | - -# Revdeps - diff --git a/revdep/cran.md b/revdep/cran.md deleted file mode 100644 index 5e0b18cb1..000000000 --- a/revdep/cran.md +++ /dev/null @@ -1,7 +0,0 @@ -## revdepcheck results - -We checked 4 reverse dependencies (0 from CRAN + 4 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. - - * We saw 0 new problems - * We failed to check 0 packages - diff --git a/revdep/email.yaml b/revdep/email.yaml deleted file mode 100644 index 03a7aab0f..000000000 --- a/revdep/email.yaml +++ /dev/null @@ -1,6 +0,0 @@ -release_date: 30.09.2022 -rel_release_date: ?? days -my_news_url: https://janmarvin.github.io/openxlsx2/news/index.html -release_version: 0.3 -my_version: ?? - diff --git a/revdep/failures.md b/revdep/failures.md deleted file mode 100644 index 9a2073633..000000000 --- a/revdep/failures.md +++ /dev/null @@ -1 +0,0 @@ -*Wow, no problems at all. :)* \ No newline at end of file diff --git a/revdep/problems.md b/revdep/problems.md deleted file mode 100644 index 9a2073633..000000000 --- a/revdep/problems.md +++ /dev/null @@ -1 +0,0 @@ -*Wow, no problems at all. :)* \ No newline at end of file