Skip to content

Commit

Permalink
Merge pull request #371 from NCC-CNC/dev
Browse files Browse the repository at this point in the history
- PR #368 
- PR #364
  • Loading branch information
DanWismer authored Jul 9, 2024
2 parents 45f2a65 + 3cb93bd commit 316b256
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ Imports:
dplyr (>= 1.0.6),
prioritizr (>= 7.1.1),
fasterize (>= 1.0.3),
rgdal (>= 1.5.23),
rcbc (>= 0.1.0.9001),
shiny (>= 1.6.0),
ipc (>= 0.1.3),
Expand Down
1 change: 0 additions & 1 deletion R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@ utils::globalVariables(
)

# define functions for internally used packages to pass checks
tmp1 <- rgdal::readOGR
tmp1 <- R.utils::gzip
tmp1 <- rcbc::cbc_solve
11 changes: 2 additions & 9 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -955,10 +955,10 @@
},
"raster": {
"Package": "raster",
"Version": "3.6-20",
"Version": "3.6-26",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "ebebd9f0f203a129eb2da96470191b82"
"Hash": "7d6eda494f34a644420ac1bfd2a8023a"
},
"rcbc": {
"Package": "rcbc",
Expand Down Expand Up @@ -1014,13 +1014,6 @@
"Repository": "CRAN",
"Hash": "079cb1f03ff972b30401ed05623cbe92"
},
"rgdal": {
"Package": "rgdal",
"Version": "1.5-23",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "bb6f643247d35c947e9f113567e2bf7a"
},
"rgeos": {
"Package": "rgeos",
"Version": "0.5-9",
Expand Down

0 comments on commit 316b256

Please sign in to comment.