Merge pull request #25 from BirdsCanada/dev

Tweak cosewic_ranges()

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

@@ -2,14 +2,28 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master, dev, sandbox]
+    branches: 
+      - main
+      - master
+      - dev
+      - sandbox
   pull_request:
-    branches: [main, master, dev, sandbox]
+    branches: 
+      - main
+      - master
+      - dev
+      - sandbox
   schedule:
     - cron: '0 0 1 * *'  # Run once a month on the 1st at midnight
-
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 name: R-CMD-check
 
+permissions: read-all
+
 jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
@@ -32,7 +46,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/pkgdown.yaml

@@ -11,6 +11,8 @@ on:
 
 name: pkgdown
 
+permissions: read-all
+
 jobs:
   pkgdown:
     runs-on: ubuntu-latest
@@ -20,8 +22,10 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       naturecounts_testuser: ${{secrets.naturecounts_testuser}}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -38,7 +42,7 @@ jobs:
             any::rnaturalearthhires
             any::rnaturalearthdata
             any::patchwork
-            any::rgdal
+            any::prettymapr
           needs: website
 
       - name: Build site
@@ -47,7 +51,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           clean: false
           branch: gh-pages

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: naturecounts
 Type: Package
 Title: Access and download data on plant and animal populations from NatureCounts
-Version: 0.4.0
+Version: 0.4.1
 Authors@R: c(
     person("Steffi", "LaZerte", email = "[email protected]", role = "aut"),
     person("Denis", "Lepage", email = "[email protected]", role = c("aut", "cre")))
@@ -44,10 +44,11 @@ Suggests:
     rmarkdown,
     sf (>= 1.0-9),
     spelling,
-    testthat
+    testthat,
+    vdiffr
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 URL: https://github.com/BirdsCanada/naturecounts,
     https://naturecounts.ca,
     https://birdscanada.github.io/naturecounts/

NEWS.md

@@ -1,3 +1,8 @@
+# naturecounts 0.4.1
+* Fix use of species_id and record_id in `cosewic_ranges()`.
+  * Truly allow different columns
+  * Also allow no `species_id` or `record_id` columns
+
 # naturecounts 0.4.0
 * Add tools for COSEWIC assessments
 * Fix bug in search_species() which returned all authorities