Skip to content

Commit d5263f4

Browse files
matthewphamiltonmatthewphamilton
committed
currently failing on write_manuals
1 parent f956fe4 commit d5263f4

90 files changed

Lines changed: 896 additions & 1561 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.

‎.Rbuildignore‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,116 @@
4343
^\.github$
4444
^data-raw/r4/s4_methds\.R$
4545
^data-raw/TESTS_R4\.R$
46+
^data-raw/OLD/C3_ready4_par_str_envir\.R$
47+
^data-raw/OLD/C3_ready4_par_val_envir\.R$
48+
^data-raw/OLD/C3_ready4_sp_abbreviations_lup\.R$
49+
^data-raw/OLD/C3_ready4_sp_data_pack_lup\.R$
50+
^data-raw/OLD/C3_ready4_sp_import_lup\.R$
51+
^data-raw/OLD/C3_ready4_sp_resolution_lup\.R$
52+
^data-raw/OLD/C3_ready4_sp_site_coord_lup\.R$
53+
^data-raw/OLD/C3_ready4_sp_starter_sf_lup\.R$
54+
^data-raw/OLD/C3_ready4_sp_uid_lup\.R$
55+
^data-raw/OLD/C4_ready4_env\.R$
56+
^data-raw/OLD/C4_ready4_lookup\.R$
57+
^data-raw/OLD/C4_ready4_macro\.R$
58+
^data-raw/OLD/C4_ready4_meso_area\.R$
59+
^data-raw/OLD/C4_ready4_meso_region\.R$
60+
^data-raw/OLD/C4_ready4_micro\.R$
61+
^data-raw/OLD/C4_ready4_profiled_area\.R$
62+
^data-raw/OLD/C4_ready4_sp_local_proc\.R$
63+
^data-raw/OLD/C4_ready4_sp_local_raw\.R$
64+
^data-raw/OLD/C4_ready4_sp_local\.R$
65+
^data-raw/OLD/db_abbreviations_lup\.R$
66+
^data-raw/OLD/db_fn_type_lup_tb\.R$
67+
^data-raw/OLD/db_fns_dmt_tb\.R$
68+
^data-raw/OLD/db_prototype_lup\.R$
69+
^data-raw/OLD/fn_add\.R$
70+
^data-raw/OLD/fn_bind\.R$
71+
^data-raw/OLD/fn_check\.R$
72+
^data-raw/OLD/fn_gen\.R$
73+
^data-raw/OLD/fn_get\.R$
74+
^data-raw/OLD/fn_intersect\.R$
75+
^data-raw/OLD/fn_make\.R$
76+
^data-raw/OLD/fn_remove\.R$
77+
^data-raw/OLD/fn_reorder\.R$
78+
^data-raw/OLD/fn_reshape\.R$
79+
^data-raw/OLD/fn_sample\.R$
80+
^data-raw/OLD/fn_simplify\.R$
81+
^data-raw/OLD/fn_subset\.R$
82+
^data-raw/OLD/fn_transform\.R$
83+
^data-raw/OLD/fn_union\.R$
84+
^data-raw/OLD/fn_update\.R$
85+
^data-raw/OLD/fn_write\.R$
86+
^data-raw/OLD/gnrc_area_bound_year\.R$
87+
^data-raw/OLD/gnrc_area_type\.R$
88+
^data-raw/OLD/gnrc_area\.R$
89+
^data-raw/OLD/gnrc_country_bound_year\.R$
90+
^data-raw/OLD/gnrc_country\.R$
91+
^data-raw/OLD/gnrc_crs_nbr\.R$
92+
^data-raw/OLD/gnrc_data_year\.R$
93+
^data-raw/OLD/gnrc_data_ymds\.R$
94+
^data-raw/OLD/gnrc_drive_time_limit_mins\.R$
95+
^data-raw/OLD/gnrc_env_sf\.R$
96+
^data-raw/OLD/gnrc_features\.R$
97+
^data-raw/OLD/gnrc_geom_dist_km_cuts\.R$
98+
^data-raw/OLD/gnrc_geom_dist_limit_km\.R$
99+
^data-raw/OLD/gnrc_global_region\.R$
100+
^data-raw/OLD/gnrc_lookup_tb\.R$
101+
^data-raw/OLD/gnrc_lup_tbs_r4\.R$
102+
^data-raw/OLD/gnrc_nbr_bands\.R$
103+
^data-raw/OLD/gnrc_par_vals\.R$
104+
^data-raw/OLD/gnrc_region_bound_year\.R$
105+
^data-raw/OLD/gnrc_region_type\.R$
106+
^data-raw/OLD/gnrc_region\.R$
107+
^data-raw/OLD/gnrc_sp_abbreviations_lup\.R$
108+
^data-raw/OLD/gnrc_sp_data_pack_lup\.R$
109+
^data-raw/OLD/gnrc_sp_import_lup\.R$
110+
^data-raw/OLD/gnrc_sp_resolution_lup\.R$
111+
^data-raw/OLD/gnrc_sp_site_coord_lup\.R$
112+
^data-raw/OLD/gnrc_sp_starter_sf_lup\.R$
113+
^data-raw/OLD/gnrc_sp_uid_lup\.R$
114+
^data-raw/OLD/gnrc_st_data\.R$
115+
^data-raw/OLD/gnrc_temporal_max\.R$
116+
^data-raw/OLD/gnrc_temporal_min\.R$
117+
^data-raw/OLD/gnrc_travel_mode\.R$
118+
^data-raw/OLD/gnrc_travel_time_mins_cuts\.R$
119+
^data-raw/OLD/gnrc_use_coord_lup\.R$
120+
^data-raw/OLD/imp_mthds\.R$
121+
^data-raw/OLD/imp_pipe\.R$
122+
^data-raw/OLD/mthd_download_data\.R$
123+
^data-raw/OLD/mthd_get_data\.R$
124+
^data-raw/OLD/mthd_import_data\.R$
125+
^data-raw/OLD/mthd_order_tb\.R$
126+
^data-raw/OLD/mthd_save_raw\.R$
127+
^data-raw/Staged/DATASET\.R$
128+
^data-raw/Staged/fns/add\.R$
129+
^data-raw/Staged/fns/bind\.R$
130+
^data-raw/Staged/fns/check\.R$
131+
^data-raw/Staged/fns/gen\.R$
132+
^data-raw/Staged/fns/get\.R$
133+
^data-raw/Staged/fns/intersect\.R$
134+
^data-raw/Staged/fns/make\.R$
135+
^data-raw/Staged/fns/remove\.R$
136+
^data-raw/Staged/fns/reorder\.R$
137+
^data-raw/Staged/fns/reshape\.R$
138+
^data-raw/Staged/fns/sample\.R$
139+
^data-raw/Staged/fns/simplify\.R$
140+
^data-raw/Staged/fns/subset\.R$
141+
^data-raw/Staged/fns/transform\.R$
142+
^data-raw/Staged/fns/union\.R$
143+
^data-raw/Staged/fns/update\.R$
144+
^data-raw/Staged/fns/write\.R$
145+
^data-raw/Staged/mthds/add_path_col\.R$
146+
^data-raw/Staged/mthds/download_data\.R$
147+
^data-raw/Staged/mthds/gen_par_vals\.R$
148+
^data-raw/Staged/mthds/get_data\.R$
149+
^data-raw/Staged/mthds/import_data\.R$
150+
^data-raw/Staged/mthds/make_data_pack\.R$
151+
^data-raw/Staged/mthds/make_import_object\.R$
152+
^data-raw/Staged/mthds/make_main_intersect_tb\.R$
153+
^data-raw/Staged/mthds/order_tb\.R$
154+
^data-raw/Staged/mthds/save_raw\.R$
155+
^data-raw/Staged/r4/s4_methds\.R$
156+
^initial_setup\.R$
157+
^doc$
158+
^Meta$

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

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Adapted from: https://github.com/ready4-dev/ready4class/runs/3657635374?check_suite_focus=true
2+
# NOTE: This workflow is overkill for most R packages
3+
# check-standard.yaml is likely a better choice
4+
# usethis::use_github_action("check-standard") will install it.
5+
#
16
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
27
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
38
on:
@@ -22,10 +27,12 @@ jobs:
2227
fail-fast: false
2328
matrix:
2429
config:
30+
- {os: macOS-latest, r: 'release'}
2531
- {os: windows-latest, r: 'release'}
26-
- {os: macOS-latest, r: 'release'}
27-
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
28-
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
32+
- {os: windows-latest, r: '3.6'}
33+
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.0.0 (ubuntu-20.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
34+
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
35+
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
2936

3037
env:
3138
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -35,11 +42,12 @@ jobs:
3542
steps:
3643
- uses: actions/checkout@v2
3744

38-
- uses: r-lib/actions/setup-r@v1
45+
- uses: r-lib/actions/setup-r@master
3946
with:
4047
r-version: ${{ matrix.config.r }}
48+
http-user-agent: ${{ matrix.config.http-user-agent }}
4149

42-
- uses: r-lib/actions/setup-pandoc@v1
50+
- uses: r-lib/actions/setup-pandoc@master
4351

4452
- name: Query dependencies
4553
run: |
@@ -49,33 +57,54 @@ jobs:
4957
shell: Rscript {0}
5058

5159
- name: Cache R packages
52-
if: runner.os != 'Windows'
53-
uses: actions/cache@v2
60+
if: runner.os != 'Windows' && !matrix.config.autobrew
61+
uses: actions/cache@v1
5462
with:
5563
path: ${{ env.R_LIBS_USER }}
56-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
57-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
64+
key: ${{ matrix.config.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
65+
restore-keys: ${{ matrix.config.os }}-${{ hashFiles('.github/R-version') }}-1-
5866

5967
- name: Install system dependencies
6068
if: runner.os == 'Linux'
6169
run: |
70+
sudo apt-get install libharfbuzz-dev
71+
sudo apt-get install libfribidi-dev
6272
while read -r cmd
6373
do
6474
eval sudo $cmd
65-
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
75+
done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "20.04"), sep = "\n")')
76+
- name: Install system dependencies
77+
if: runner.os == 'MacOS' && !matrix.config.autobrew
78+
run: brew install harfbuzz fribidi
79+
80+
- name: Remove homebrew
81+
if: matrix.config.autobrew
82+
uses: autobrew/uninstall-homebrew@master
6683

6784
- name: Install dependencies
6885
run: |
6986
remotes::install_deps(dependencies = TRUE)
7087
remotes::install_cran("rcmdcheck")
7188
shell: Rscript {0}
7289

90+
- name: Session info
91+
run: |
92+
options(width = 100)
93+
pkgs <- installed.packages()[, "Package"]
94+
sessioninfo::session_info(pkgs, include_base = TRUE)
95+
shell: Rscript {0}
96+
7397
- name: Check
7498
env:
75-
_R_CHECK_CRAN_INCOMING_REMOTE_: false
99+
_R_CHECK_CRAN_INCOMING_: false
76100
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
77101
shell: Rscript {0}
78102

103+
- name: Show testthat output
104+
if: always()
105+
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
106+
shell: bash
107+
79108
- name: Upload check results
80109
if: failure()
81110
uses: actions/upload-artifact@main

‎.github/workflows/pkgdown.yaml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
branches: [main, master]
8+
release:
9+
types: [published]
10+
workflow_dispatch:
11+
12+
name: pkgdown
13+
14+
jobs:
15+
pkgdown:
16+
runs-on: ubuntu-latest
17+
# Only restrict concurrency for non-PR jobs
18+
concurrency:
19+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
20+
env:
21+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
22+
steps:
23+
- uses: actions/checkout@v3
24+
25+
- uses: r-lib/actions/setup-pandoc@v2
26+
27+
- uses: r-lib/actions/setup-r@v2
28+
with:
29+
use-public-rspm: true
30+
31+
- uses: r-lib/actions/setup-r-dependencies@v2
32+
with:
33+
extra-packages: any::pkgdown, local::.
34+
needs: website
35+
36+
- name: Build site
37+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
38+
shell: Rscript {0}
39+
40+
- name: Deploy to GitHub pages 🚀
41+
if: github.event_name != 'pull_request'
42+
uses: JamesIves/github-pages-deploy-action@v4.4.1
43+
with:
44+
clean: false
45+
branch: gh-pages
46+
folder: docs

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ vignettes/*.pdf
3030
*.knit.md
3131
.Rproj.user
3232
docs
33+
/doc/
34+
/Meta/

‎LICENSE‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ready4space - Standardised Modeller Tools for Retrieving, Managing and
2-
Synthesising Spatial Data in Projects Developed with the Ready4 Suite
3-
Copyright (C) 2020 Orygen
1+
ready4space - Model Spatial Attributes with Ready4
2+
Copyright (C) 2023 Orygen
43

54
This program is free software: you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎NAMESPACE‎

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,34 @@
11
# Generated by roxygen2: do not edit by hand
22

33
export("%>%")
4-
export(is_ready4_param_str_envir)
5-
export(is_ready4_param_val_envir)
6-
export(is_ready4_sp_abbreviations_lup)
7-
export(is_ready4_sp_data_pack_lup)
8-
export(is_ready4_sp_import_lup)
9-
export(is_ready4_sp_resolution_lup)
10-
export(is_ready4_sp_site_coord_lup)
11-
export(is_ready4_sp_starter_sf_lup)
12-
export(is_ready4_sp_uid_lup)
13-
export(make_new_ready4_param_str_envir)
14-
export(make_new_ready4_param_val_envir)
15-
export(make_new_ready4_sp_abbreviations_lup)
16-
export(make_new_ready4_sp_data_pack_lup)
17-
export(make_new_ready4_sp_import_lup)
18-
export(make_new_ready4_sp_resolution_lup)
19-
export(make_new_ready4_sp_site_coord_lup)
20-
export(make_new_ready4_sp_starter_sf_lup)
21-
export(make_new_ready4_sp_uid_lup)
22-
export(make_pt_ready4_param_str_envir)
23-
export(make_pt_ready4_param_val_envir)
24-
export(make_pt_ready4_sp_abbreviations_lup)
25-
export(make_pt_ready4_sp_data_pack_lup)
26-
export(make_pt_ready4_sp_import_lup)
27-
export(make_pt_ready4_sp_resolution_lup)
28-
export(make_pt_ready4_sp_site_coord_lup)
29-
export(make_pt_ready4_sp_starter_sf_lup)
30-
export(make_pt_ready4_sp_uid_lup)
31-
export(ready4_param_str_envir)
32-
export(ready4_param_val_envir)
33-
export(ready4_sp_abbreviations_lup)
34-
export(ready4_sp_data_pack_lup)
35-
export(ready4_sp_import_lup)
36-
export(ready4_sp_resolution_lup)
37-
export(ready4_sp_site_coord_lup)
38-
export(ready4_sp_starter_sf_lup)
39-
export(ready4_sp_uid_lup)
40-
export(validate_ready4_param_str_envir)
41-
export(validate_ready4_param_val_envir)
42-
export(validate_ready4_sp_abbreviations_lup)
43-
export(validate_ready4_sp_data_pack_lup)
44-
export(validate_ready4_sp_import_lup)
45-
export(validate_ready4_sp_resolution_lup)
46-
export(validate_ready4_sp_site_coord_lup)
47-
export(validate_ready4_sp_starter_sf_lup)
48-
export(validate_ready4_sp_uid_lup)
4+
export(Ready4spaceenv)
5+
export(add_uid_lup)
6+
export(deprecated)
7+
export(is_ready4space_parameters)
8+
export(is_ready4space_values)
9+
export(make_new_ready4space_parameters)
10+
export(make_new_ready4space_values)
11+
export(make_pt_ready4space_parameters)
12+
export(make_pt_ready4space_values)
13+
export(ready4space_parameters)
14+
export(ready4space_values)
15+
export(validate_ready4space_parameters)
16+
export(validate_ready4space_values)
17+
exportClasses(Ready4spaceenv)
4918
import(methods)
50-
import(ready4use)
5119
importFrom(dplyr,arrange)
5220
importFrom(dplyr,filter)
5321
importFrom(dplyr,pull)
5422
importFrom(dplyr,summarise_all)
23+
importFrom(lifecycle,deprecated)
5524
importFrom(magrittr,"%>%")
5625
importFrom(purrr,map2_chr)
26+
importFrom(purrr,map_chr)
5727
importFrom(ready4,update_pt_fn_args_ls)
5828
importFrom(rlang,exec)
5929
importFrom(stringr,str_c)
6030
importFrom(stringr,str_detect)
31+
importFrom(tibble,add_row)
6132
importFrom(tibble,is_tibble)
6233
importFrom(tibble,tibble)
6334
importFrom(tidyr,gather)

0 commit comments

Comments
 (0)