Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhsparks committed Jan 24, 2020
2 parents b137503 + 373ec96 commit 4a8ecf5
Show file tree
Hide file tree
Showing 30 changed files with 917 additions and 856 deletions.
80 changes: 80 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
on:
push:
branches:
- '*'
- '!*/*'
pull_request:
branches:
- '*'
- '!*/*'

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: windows-latest, r: '3.6'}
- { os: macOS-latest, r: '3.6'}
- { os: ubuntu-18.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}
- { os: ubuntu-18.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}
- { os: ubuntu-18.04, r: 'devel', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
CRAN: ${{ matrix.config.cran }}

steps:
- uses: actions/checkout@v1

- uses: r-lib/actions/setup-r@master
with:
r-version: ${{ matrix.config.r }}

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

- name: Install apt spatial libs
if: runner.os == 'Linux'
env:
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
run: |
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
sudo apt-get update
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libudunits2-dev libproj-dev libgeos-dev libgdal-dev
- name: Query dependencies
run: Rscript -e "install.packages('remotes')" -e "saveRDS(remotes::dev_package_deps(dependencies = TRUE), 'depends.Rds')"

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-

- 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"
- name: Install dependencies
run: Rscript -e "library(remotes)" -e "update(readRDS('depends.Rds'))" -e "remotes::install_cran('rcmdcheck')"

- name: Check
run: Rscript -e "rcmdcheck::rcmdcheck(args = '--no-manual', error_on = 'warning', check_dir = 'check')"

- name: Test coverage
if: matrix.config.os == 'macOS-latest' && matrix.config.r == '3.6'
run: |
Rscript -e 'covr::codecov(token = "${{secrets.CODECOV_TOKEN}}")'
22 changes: 13 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: GSODR
Type: Package
Title: Global Surface Summary of the Day ('GSOD') Weather Data Client
Version: 2.0.0
Version: 2.0.1
Authors@R: c(person("Adam", "Sparks", role = c("aut", "cre"),
email = "adamhsparks@gmail.com",
comment = c(ORCID = "0000-0002-0061-8359")),
Expand All @@ -14,14 +14,18 @@ Authors@R: c(person("Adam", "Sparks", role = c("aut", "cre"),
person("Hugh", "Parsonage", role = c("cph", "ctb"),
email = "hugh.parsonage@gmail.com",
comment = c(ORCID = "0000-0003-4055-0835")),
person("Gwenael", "Giboire", email = "gwenael.giboire@oda-groupe.com",
role = "ctb",
person("Taras", "Kaduk", role = "ctb",
email = "taras.kaduk@gmail.com",
comment = "Suggestion for handling bulk station downloads more
efficiently"),
person("Gwenael", "Giboire", role = "ctb",
email = "gwenael.giboire@oda-groupe.com",
comment = "Several bug reports in early versions and testing feedback"),
person("Łukasz","Pawlik", email = "lukpawlik@gmail.com", role = "ctb",
person("Łukasz", "Pawlik", role = "ctb", email = "lukpawlik@gmail.com",
comment = "Reported bug in windspeed conversion calculation"),
person("Ross","Darnell", email = "Ross.Darnell@data61.csiro.au",
role = "ctb", comment = "Reported bug in 'Windows OS' versions causing
'GSOD' data untarring to fail"))
person("Ross","Darnell", role = "ctb",
email = "Ross.Darnell@data61.csiro.au", comment = "Reported bug in 'Windows
OS' versions causing 'GSOD' data untarring to fail"))
URL: https://docs.ropensci.org/GSODR/
BugReports: https://github.com/ropensci/GSODR/issues
Description: Provides automated downloading, parsing, cleaning, unit conversion
Expand All @@ -41,7 +45,7 @@ Description: Provides automated downloading, parsing, cleaning, unit conversion
'readme.txt' file available from,
<http://www1.ncdc.noaa.gov/pub/data/gsod/readme.txt>.
Depends:
R (>= 3.3.0)
R (>= 3.5.0)
License: MIT + file LICENSE
Imports:
countrycode,
Expand Down Expand Up @@ -72,7 +76,7 @@ Suggests:
spacetime,
testthat,
tidyr
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
Roxygen: list(markdown = TRUE)
Encoding: UTF-8
NeedsCompilation: no
Expand Down
Loading

0 comments on commit 4a8ecf5

Please sign in to comment.