Merge pull request #357 from weecology/devdocs

Devdocs
weecology · May 18, 2023 · b08ce9d · b08ce9d
2 parents ddb0638 + 8ad68d5
commit b08ce9d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -6,15 +6,15 @@ Please include a summary of the change and which issue is fixed. Please also inc
 
 Fixes # (issue)
 
-## Type of change
 
-Please delete options that are not relevant.
+## Type of change
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Not backwards compatible new feature (breaking change which adds functionality)
 - [ ] New model
 - [ ] New dataset
+- [ ] Documentation edit
 
 
 ## How Has This Been Tested?
@@ -37,6 +37,7 @@ We conduct testing cross-platform. Please indicate if any platforms were added t
 - [ ] Any dependent changes have been merged and published in downstream modules
 - [ ] I have checked my code and corrected any misspellings
 
+
 ## Review
 
 Please tag at least one code reviewer (@juniperlsimonis) in your PR. 
diff --git a/.github/workflows/r-cmd-check.yaml b/.github/workflows/r-cmd-check.yaml
@@ -22,11 +22,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {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'}
-          - {os: macOS-latest,   r: 'release'} 
+          - {os: windows-latest, r: 'release', rtools: '43'}
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release', rtools: ''}
+          - {os: ubuntu-latest,  r: 'release', rtools: ''}
+          - {os: ubuntu-latest,  r: 'oldrel-1', rtools: ''}
+          - {os: macOS-latest,   r: 'release', rtools: ''} 
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -53,6 +53,7 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
+          rtools-version: ${{ matrix.config.rtools }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: portalcasting
 Title: Model and Forecast Portal Rodent Dynamics
-Version: 0.57.0
+Version: 0.58.0
 Authors@R: c(
     person(c("Juniper", "L."), "Simonis",
       email = "[email protected]", role = c("aut", "cre"),
@@ -35,6 +35,7 @@ Imports:
   bslib,
   coda,
   english,
+  git2r,
   htmltools,
   httr,
   jsonlite,

diff --git a/NAMESPACE b/NAMESPACE
@@ -197,6 +197,7 @@ importFrom(forecast,auto.arima)
 importFrom(forecast,ets)
 importFrom(forecast,forecast)
 importFrom(forecast,na.interp)
+importFrom(git2r,last_commit)
 importFrom(grDevices,grey)
 importFrom(grDevices,rgb)
 importFrom(graphics,abline)

diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,15 @@
 
 Version numbers follow [Semantic Versioning](https://semver.org/).
 
+# [portalcasting 0.58.0](https://github.com/weecology/portalcasting/releases/tag/v0.58.0)
+*5-18-2023*
+
+## Editing documentation
+* Auto templates for issues and prs 
+
+## Inclduing git2r in the package
+* Was removed accidentally from dockerfile causing breaks in main repo, seeing if it works to be in the package itself
+
 # [portalcasting 0.57.0](https://github.com/weecology/portalcasting/releases/tag/v0.57.0)
 *5-12-2023*
 

diff --git a/R/portalcasting.R b/R/portalcasting.R
@@ -3,6 +3,7 @@
 #' @importFrom coda as.mcmc HPDinterval
 #' @importFrom english english
 #' @importFrom forecast Arima auto.arima ets forecast na.interp
+#' @importFrom git2r last_commit
 #' @importFrom graphics abline axis mtext par plot points polygon rect text
 #' @importFrom grDevices grey rgb
 #' @importFrom htmltools a br div h2 h3 h4 HTML includeHTML includeMarkdown p tags

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -17,7 +17,6 @@ RUN apt-get update \
     && apt-get install -y \
        jags
 
-
 # Install portalcasting from github event that triggered the specific workflow
 
 ARG event_sha="HEAD"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ RUN apt-get update \ @@
         && apt-get install -y \
            jags
     # Install portalcasting from github event that triggered the specific workflow
     ARG event_sha="HEAD"
@@ Expand Down @@