Skip to content

Commit af5757d

Browse files
authored
Merge pull request #100 from mountainMath/v0.3.10
V0.3.10
2 parents 889382a + ad8a8cc commit af5757d

72 files changed

Lines changed: 361 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ jobs:
3131
- {os: macOS-latest, r: 'release'}
3232
# - {os: windows-latest, r: 'release'}
3333
- {os: windows-latest, r: '3.6'}
34-
- {os: ubuntu-16.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
35-
- {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
36-
- {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
37-
- {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
38-
- {os: ubuntu-16.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
34+
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
35+
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
36+
# - {os: ubuntu-16.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
37+
# - {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
38+
# - {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
39+
# - {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
40+
# - {os: ubuntu-16.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
3941
# - {os: ubuntu-16.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
4042

4143
env:
@@ -67,16 +69,16 @@ jobs:
6769
uses: actions/cache@v2
6870
with:
6971
path: ${{ env.R_LIBS_USER }}
70-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
71-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
72+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
73+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-2-
7274

7375
- name: Install system dependencies
7476
if: runner.os == 'Linux'
7577
run: |
7678
while read -r cmd
7779
do
7880
eval sudo $cmd
79-
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "16.04"))')
81+
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
8082
8183
- name: Install dependencies
8284
run: |

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: cansim
22
Type: Package
33
Title: Accessing Statistics Canada Data Table and Vectors
4-
Version: 0.3.9
4+
Version: 0.3.10
55
Authors@R: c(
66
person("Jens", "von Bergmann", email = "jens@mountainmath.ca", role = c("cre")),
77
person("Dmitry", "Shkolnik", email = "shkolnikd@gmail.com", role = c("aut")))
@@ -30,7 +30,7 @@ Imports: digest (>= 0.1),
3030
utils,
3131
DBI,
3232
RSQLite
33-
RoxygenNote: 7.1.1
33+
RoxygenNote: 7.1.2
3434
Suggests: knitr,
3535
rmarkdown,
3636
scales,

NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# cansim 0.3.10
2+
## Minor changes
3+
* Better error handling when StatCan returns empty tables
4+
* Add Hierachy for Geography in sqlite tables
5+
* Better fallback and warning messages when StatCan table categories are internally inconsistent
6+
* Performance improvements
7+
18
# cansim 0.3.9
29
## Major changes
310
* deprecate `list_cansim_tables` and `serach_cansim_tables` and fallback to corresponding "_cube" methods as Open Data Canada API has changed and similar functionality is available through the "_cube" methods that tie directly into StatCan APIS

R/cansim.R

Lines changed: 86 additions & 179 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ If you want to get in touch, we are pretty good at responding via email or via t
173173

174174
If you wish to cite the `cansim` package in your work:
175175

176-
von Bergmann, J., Dmitry Shkolnik (2021). cansim: functions and convenience tools for accessing Statistics Canada data tables. v0.3.9.
176+
von Bergmann, J., Dmitry Shkolnik (2021). cansim: functions and convenience tools for accessing Statistics Canada data tables. v0.3.10.
177177

178178
A BibTeX entry for LaTeX users is
179179
```
180180
@Manual{,
181181
author = {Jens {von Bergmann} and Dmitry Shkolnik},
182182
title = {cansim: functions and convenience tools for accessing Statistics Canada data tables},
183183
year = {2021},
184-
note = {R package version 0.3.9},
184+
note = {R package version 0.3.10},
185185
url = {https://mountainmath.github.io/cansim/},
186186
}
187187
```

cran-comments.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,10 @@ There were no ERRORs or WARNINGs or NOTEs.
6969
* Check for expired tables in `list_cansim_sqlite_cached_tables`
7070
* New auto-update feature for sqlite tables
7171

72+
# Changes from version 0.3.9
73+
## Minor changes
74+
* Better error handling when StatCan returns empty tables
75+
* Add Hierachy for Geography in sqlite tables
76+
* Better fallback and warning messages when StatCan table categories are internally inconsistent
77+
* Performance improvements
78+

docs/404.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE-text.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/cansim.html

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)