Skip to content

Commit

Permalink
Merge pull request #271 from rOpenGov/dev
Browse files Browse the repository at this point in the history
Version 0.16.3
  • Loading branch information
MansMeg authored Jan 13, 2024
2 parents 75a4fe4 + 1f6ebb3 commit 58cb7b1
Show file tree
Hide file tree
Showing 70 changed files with 1,801 additions and 1,704 deletions.
106 changes: 0 additions & 106 deletions .github/workflows/R-CMD-check.yaml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/check-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 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:
paths-ignore:
- 'paper/**'
branches:
- main
- master
- development
- dev
pull_request:
paths-ignore:
- 'paper/**'
branches:
- main
- master
- development
- dev

name: R-CMD-check (release)

jobs:
R-CMD-check:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes
steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
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
48 changes: 48 additions & 0 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 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:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'

name: R-CMD-check (standard)

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@v3

- 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
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: pxweb
Title: R Interface to PXWEB APIs
Version: 0.16.2
Date: 2022-10-31
Version: 0.16.3
Date: 2024-01-14
Authors@R: c(
person("Mans", "Magnusson", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-0296-2719")),
Expand Down Expand Up @@ -47,6 +47,6 @@ Suggests:
VignetteBuilder:
knitr
Encoding: UTF-8
RoxygenNote: 7.2.0
RoxygenNote: 7.2.3
X-schema.org-isPartOf: http://ropengov.org/
X-schema.org-keywords: ropengov
16 changes: 8 additions & 8 deletions R/defunct_functions.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#' Defunct functions
#'
#' @description
#'
#' @description
#' These function has as from version 0.10.0 become defunct.
#' Call the functions to get information on new functions to use.
#'
#'
#' @param url Defunct argument.
#' @param ... Defunct argument.
#' @param api Defunct argument.
Expand All @@ -19,15 +19,15 @@
#' @param quiet Defunct argument.
#' @param path Defunct argument.
#' @param topnodes Defunct argument.
#'
#'
#' @export
api_catalogue <- function(){
api_catalogue <- function() {
.Defunct("pxweb_api_catalogue")
}

#' @rdname api_catalogue
#' @export
update_pxweb_apis <- function(){
update_pxweb_apis <- function() {
.Defunct(msg = "update_pxweb_apis() is no longer allowed by CRAN. See vignette(\"pxweb\") on how to update your API catalogue.")
}

Expand All @@ -52,7 +52,7 @@ get_pxweb_data <- function(url, dims, clean = FALSE, encoding = NULL) {

#' @rdname api_catalogue
#' @export
get_pxweb_dims <- function(node, verbose=TRUE) {
get_pxweb_dims <- function(node, verbose = TRUE) {
.Defunct("pxweb_advanced_get")
}

Expand All @@ -70,7 +70,7 @@ get_pxweb_metadata <- function(path = NULL, node = NULL, topnodes = NULL, quiet

#' @rdname api_catalogue
#' @export pxweb_api
pxweb_api <- list(new =function(){
pxweb_api <- list(new = function() {
.Defunct(msg = "'pxweb_api' class is defunct. \nUse 'pxweb' instead.\nSee help(\"Defunct\") ")
})

Expand Down
5 changes: 1 addition & 4 deletions R/onAttach.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
.onAttach <- function(lib, pkg)
{

.onAttach <- function(lib, pkg) {
packageStartupMessage(paste0("pxweb ", utils::packageVersion("pxweb"), ": R tools for the PX-WEB API.\nhttps://github.com/ropengov/pxweb\n"))

}
12 changes: 6 additions & 6 deletions R/pxweb-package.R
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#' @title Interface to PX-WEB APIs from R
#'
#' @description
#'
#' @description
#' PXWEB is a common web API used by many European Statistical agencies to disseminate official statistics.
#' The pxweb package facilitates connections and usage of these APIs.
#'
#' @references
#'
#' @references
#' The decription of the PXWEB API here:
#' \url{https://www.scb.se/en/About-us/about-the-website-and-terms-of-use/open-data-api/}
#' The official home page of PXWEB can be found here:
#' \url{https://www.scb.se/en/services/statistical-programs-for-px-files/px-web/}
#'
#'
#' @name pxweb-package
#' @docType package
NULL
NULL
Loading

0 comments on commit 58cb7b1

Please sign in to comment.