Merge pull request #1 from JohnCoene/master

update

.github/workflows/R-CMD-check.yaml

@@ -1,9 +1,13 @@
+# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
+# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
 on:
   push:
     branches:
+      - main
       - master
   pull_request:
     branches:
+      - main
       - master
 
 name: R-CMD-check
@@ -18,9 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: '3.6'}
-          - {os: macOS-latest, r: '3.6'}
-          - {os: ubuntu-16.04, r: '3.6', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
+          - {os: windows-latest, r: 'release'}
+          - {os: macOS-latest, r: 'release'}
+          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -29,34 +33,34 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-r@v1
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@v1
 
       - name: Query dependencies
         run: |
           install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
+          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: Cache R packages
         if: runner.os != 'Windows'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
-          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-
+          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'
-        env:
-          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
         run: |
-          Rscript -e "remotes::install_github('r-hub/sysreqs')"
-          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
-          sudo -s eval "$sysreqs"
+          while read -r cmd
+          do
+            eval sudo $cmd
+          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
 
       - name: Install dependencies
         run: |
@@ -65,12 +69,14 @@ jobs:
         shell: Rscript {0}
 
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
+        env:
+          _R_CHECK_CRAN_INCOMING_REMOTE_: false
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
         shell: Rscript {0}
 
       - name: Upload check results
         if: failure()
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@main
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
           path: check

.travis.yml

@@ -22,3 +22,6 @@ before_install:
 
 r_build_args: --no-build-vignettes
 r_check_args: --no-build-vignettes
+
+after_success:
+  - Rscript -e 'covr::coveralls()'

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2020-10-16.
+Once it is accepted, delete this file and tag the release (commit d934439).

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: echarts4r
 Title: Create Interactive Graphs with 'Echarts JavaScript' Version 4
-Date: 2020-06-17
+Date: 2020-10-15
 Version: 0.3.3
 Authors@R: c(
   person("John", "Coene", email = "jcoenep@gmail.com", role = c("aut", "cre", "cph")), 
@@ -16,7 +16,6 @@ Imports:
   dplyr (>= 0.7.0),
   purrr,
   countrycode,
-  d3r,
   broom,
   shiny,
   scales,
@@ -28,8 +27,8 @@ Suggests:
     tidyr,
     testthat,
     knitr,
-    rmarkdown
+    rmarkdown,
+    covr
 RoxygenNote: 7.1.1.9000
 URL: https://echarts4r.john-coene.com/
-BugReports: https://github.com/JohnCoene/echarts4r/issues
-VignetteBuilder: knitr
+BugReports: https://github.com/JohnCoene/echarts4r/issues/

LICENSE.md

@@ -8,55 +8,55 @@ _&lt;<http://www.apache.org/licenses/>&gt;_
 
 #### 1. Definitions
 
-“License” shall mean the terms and conditions for use, reproduction, and
+**"License"** shall mean the terms and conditions for use, reproduction, and
 distribution as defined by Sections 1 through 9 of this document.
 
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
+**"Licensor"** shall mean the copyright owner or entity authorized by the copyright
 owner that is granting the License.
 
-“Legal Entity” shall mean the union of the acting entity and all other entities
+**"Legal Entity"** shall mean the union of the acting entity and all other entities
 that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means **(i)** the power, direct or
+For the purposes of this definition, **"control"** means **(i)** the power, direct or
 indirect, to cause the direction or management of such entity, whether by
 contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
 outstanding shares, or **(iii)** beneficial ownership of such entity.
 
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
+**"You"** (or **"Your"**) shall mean an individual or Legal Entity exercising
 permissions granted by this License.
 
-“Source” form shall mean the preferred form for making modifications, including
+**"Source"** form shall mean the preferred form for making modifications, including
 but not limited to software source code, documentation source, and configuration
 files.
 
-“Object” form shall mean any form resulting from mechanical transformation or
+**"Object"** form shall mean any form resulting from mechanical transformation or
 translation of a Source form, including but not limited to compiled object code,
 generated documentation, and conversions to other media types.
 
-“Work” shall mean the work of authorship, whether in Source or Object form, made
+**"Work"** shall mean the work of authorship, whether in Source or Object form, made
 available under the License, as indicated by a copyright notice that is included
 in or attached to the work (an example is provided in the Appendix below).
 
-“Derivative Works” shall mean any work, whether in Source or Object form, that
+**"Derivative Works"** shall mean any work, whether in Source or Object form, that
 is based on (or derived from) the Work and for which the editorial revisions,
 annotations, elaborations, or other modifications represent, as a whole, an
 original work of authorship. For the purposes of this License, Derivative Works
 shall not include works that remain separable from, or merely link (or bind by
 name) to the interfaces of, the Work and Derivative Works thereof.
 
-“Contribution” shall mean any work of authorship, including the original version
+**"Contribution"** shall mean any work of authorship, including the original version
 of the Work and any modifications or additions to that Work or Derivative Works
 thereof, that is intentionally submitted to Licensor for inclusion in the Work
 by the copyright owner or by an individual or Legal Entity authorized to submit
 on behalf of the copyright owner. For the purposes of this definition,
-“submitted” means any form of electronic, verbal, or written communication sent
+**"submitted"** means any form of electronic, verbal, or written communication sent
 to the Licensor or its representatives, including but not limited to
 communication on electronic mailing lists, source code control systems, and
 issue tracking systems that are managed by, or on behalf of, the Licensor for
 the purpose of discussing and improving the Work, but excluding communication
 that is conspicuously marked or otherwise designated in writing by the copyright
-owner as “Not a Contribution.”
+owner as **"Not a Contribution."**
 
-“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+**"Contributor"** shall mean Licensor and any individual or Legal Entity on behalf
 of whom a Contribution has been received by Licensor and subsequently
 incorporated within the Work.
 
@@ -97,7 +97,7 @@ changed the files; and
 all copyright, patent, trademark, and attribution notices from the Source form
 of the Work, excluding those notices that do not pertain to any part of the
 Derivative Works; and
-* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+* **(d)** If the Work includes a **"NOTICE"** text file as part of its distribution, then any
 Derivative Works that You distribute must include a readable copy of the
 attribution notices contained within such NOTICE file, excluding those notices
 that do not pertain to any part of the Derivative Works, in at least one of the
@@ -136,7 +136,7 @@ reproducing the content of the NOTICE file.
 #### 7. Disclaimer of Warranty
 
 Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
 including, without limitation, any warranties or conditions of TITLE,
 NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
@@ -176,7 +176,7 @@ notice, with the fields enclosed by brackets `[]` replaced with your own
 identifying information. (Don't include the brackets!) The text should be
 enclosed in the appropriate comment syntax for the file format. We also
 recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
+the same "printed page" as the copyright notice for easier identification within
 third-party archives.
 
     Copyright 2018 John Coene

NEWS.md

@@ -2,20 +2,24 @@
 
 - Added `echarts4rBox`, `renderEcharts4rBox`, and `echarts4rBoxOutput` to create value boxes.
 - Fix `e_common` theme, was no longer applied due to dynamic dependencies introduced in `0.3.2`
-- Fix `e_flip_coords` for timeline feature, see [#166](https://github.com/JohnCoene/echarts4r/issues/166)
-- `name` argument was not used in `e_boxplot`, see [#171](https://github.com/JohnCoene/echarts4r/issues/171)
-- Allow customising area under the curve of density plot see [#172](https://github.com/JohnCoene/echarts4r/issues/172)
+- Fix `e_flip_coords` for timeline feature, see [#166](https://github.com/JohnCoene/echarts4r/issues/166/)
+- `name` argument was not used in `e_boxplot`, see [#171](https://github.com/JohnCoene/echarts4r/issues/171/)
+- Allow customising area under the curve of density plot see [#172](https://github.com/JohnCoene/echarts4r/issues/172/)
 - Update mapbox dependency from `0.38` to `1.11`
-- Fix country name conversion in `e_country_names` [#189](https://github.com/JohnCoene/echarts4r/issues/189)
-- Fix legend toggle in radar charts [#74](https://github.com/JohnCoene/echarts4r/issues/74)
-- `e_loess`, and `e_lm` take a `model_args` argument to pass arguments to underlying model function [#194](https://github.com/JohnCoene/echarts4r/issues/194)
+- Fix country name conversion in `e_country_names` [#189](https://github.com/JohnCoene/echarts4r/issues/189/)
+- Fix legend toggle in radar charts [#74](https://github.com/JohnCoene/echarts4r/issues/74/)
+- `e_loess`, and `e_lm` take a `model_args` argument to pass arguments to underlying model function [#194](https://github.com/JohnCoene/echarts4r/issues/194/)
 - Bump to JavaScript version to `4.9.0`
-- `echarts_from_json` supports functions, see [199](https://github.com/JohnCoene/echarts4r/pull/199) (thanks to [swsoyee](https://github.com/swsoyee))
+- `echarts_from_json` supports functions, see [199](https://github.com/JohnCoene/echarts4r/pull/199/) (thanks to [swsoyee](https://github.com/swsoyee/))
+- Remove `e_facet`, was wrongly exported [#212](https://github.com/JohnCoene/echarts4r/issues/212/)
+- Add tests, thanks to Etienne Bacher, see [#201](https://github.com/JohnCoene/echarts4r/pull/201/)
+- Add styler, thanks to Wei Su see [#211](https://github.com/JohnCoene/echarts4r/pull/211/)
+- Removed the {d3r} import: no longer necessary.
 
 # echarts4r 0.3.2
 
 - Bump echarts.js to 4.8.0 and echarts-gl to 1.1.2
-- Fix `e_add` when used with timeline feature see [#165](https://github.com/JohnCoene/echarts4r/issues/165).
+- Fix `e_add` when used with timeline feature see [#165](https://github.com/JohnCoene/echarts4r/issues/165/).
 - Bump echart.js to 4.8.0 now in english (no longer Chinese).
 
 Dynamic dependencies:
@@ -118,7 +122,7 @@ __Support for timeline added__
 
 Arguments containing `.` have been replaced by `_` for clarity. I.e.: `coord.system` => `coord_system`.
 
-Deprecated functions from `0.1.2` have been removed, they can be found in the [echarts4r.assets](http://echarts4r-assets.john-coene.com/) package:
+Deprecated functions from `0.1.2` have been removed, they can be found in the [echarts4r.assets](https://echarts4r-assets.john-coene.com/) package:
 
 - `e_convert_texture`
 - `e_stars_texture`
@@ -139,7 +143,7 @@ Retired `e_keras_history` due to its uselessness.
 * `e_add` added for nested data.
 * `e_showtip_p` and `e_hidetip_p` fixed.
 * `e_focus_adjacency_p` and `e_unfocus_adjacency_p` proxies to highlight adjacent nodes (on graph/network) added.
-* Deprecation of texture related functions in favour of [echarts4r.assets](http://echarts4r-assets.john-coene.com/).
+* Deprecation of texture related functions in favour of [echarts4r.assets](https://echarts4r-assets.john-coene.com/).
 * `e_single_axis` added, works with `e_scatter`.
 * `e_text_style` added, to customise global fonts.
 * `e_angle_axis` now takes `serie` argument, see example.