Merge pull request #20 from KWB-R/clean

Clean

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

@@ -22,24 +22,25 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'release'}      
-          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}      
-          - {os: windows-latest, r: 'devel'}          
+          - {os: macOS-latest, r: 'release'}
+          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'oldrel'}
           - {os: windows-latest, r: 'release'}
 
     env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}
 
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
         run: |

DESCRIPTION

@@ -25,13 +25,15 @@ BugReports: https://github.com/KWB-R/kwb.budget/issues
 Imports:
     dplyr,
     fs,
-    kwb.nextcloud (>= 0.1.0),
-    kwb.utils (>= 0.6.0),
+    kwb.nextcloud,
+    kwb.utils,
     magrittr,
     parallel,
     openxlsx (>= 4.1.4),
+    readr,
     rlang, 
-    stringr
+    stringr,
+    tidyr
 Suggests: 
     covr,
     knitr,
@@ -40,8 +42,8 @@ VignetteBuilder:
     knitr
 Remotes:
     github::kwb-r/kwb.nextcloud@dev,
-    github::kwb-r/kwb.utils@v0.6.0
+    github::kwb-r/kwb.utils
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.0
+RoxygenNote: 7.3.1

NAMESPACE

@@ -2,14 +2,19 @@
 
 export("%>%")
 export(append_zero_costs)
+export(create_partner_template_xls)
 export(create_partners_budget_files)
+export(download_matching_files)
 export(get_costs_by_sector)
 export(get_costs_by_type)
 export(get_costs_by_work_package)
 export(get_named_excel_ranges)
-export(list_partner_budget_versions)
+export(read_or_write_csv)
 export(read_partner_budget_from_excel)
+export(read_partner_info)
 export(read_partners_budget_from_excel)
+export(to_cost_matrices)
+export(upload_files)
 importFrom(dplyr,arrange)
 importFrom(dplyr,desc)
 importFrom(dplyr,group_by)
@@ -18,8 +23,10 @@ importFrom(dplyr,summarise)
 importFrom(dplyr,summarize)
 importFrom(fs,dir_create)
 importFrom(fs,file_copy)
-importFrom(kwb.nextcloud,list_file_versions)
+importFrom(kwb.nextcloud,upload_file)
 importFrom(kwb.utils,catAndRun)
+importFrom(kwb.utils,countOrSum)
+importFrom(kwb.utils,createDirectory)
 importFrom(kwb.utils,defaultIfNA)
 importFrom(kwb.utils,extractSubstring)
 importFrom(kwb.utils,getAttribute)
@@ -28,16 +35,21 @@ importFrom(kwb.utils,rbindAll)
 importFrom(kwb.utils,removeColumns)
 importFrom(kwb.utils,renameAndSelect)
 importFrom(kwb.utils,safeRowBind)
+importFrom(kwb.utils,selectColumns)
 importFrom(kwb.utils,toLookupTable)
 importFrom(magrittr,"%>%")
 importFrom(openxlsx,getNamedRegions)
 importFrom(openxlsx,loadWorkbook)
 importFrom(openxlsx,read.xlsx)
 importFrom(openxlsx,saveWorkbook)
+importFrom(openxlsx,write.xlsx)
 importFrom(openxlsx,writeData)
 importFrom(parallel,detectCores)
 importFrom(parallel,makeCluster)
 importFrom(parallel,parLapply)
 importFrom(parallel,stopCluster)
+importFrom(readr,read_csv)
+importFrom(readr,write_csv)
 importFrom(rlang,.data)
 importFrom(stringr,str_extract)
+importFrom(tidyr,spread)