Skip to content

Commit ba14ef2

Browse files
FelixMayFelixMay
committed
fix merge conflicts
Merge branch 'master' of https://github.com/MoBiodiv/mobsim # Conflicts: # tests/testthat/Rplots.pdf
2 parents 69e40a6 + 14606e9 commit ba14ef2

11 files changed

+104
-119
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- {os: windows-latest, r: 'release'}
3232
# Use 3.6 to trigger usage of RTools35
33-
- {os: windows-latest, r: '3.6'}
33+
#- {os: windows-latest, r: '3.6'}
3434
# use 4.1 to check with rtools40's older compiler
3535
- {os: windows-latest, r: '4.1'}
3636

@@ -39,7 +39,7 @@ jobs:
3939
- {os: ubuntu-latest, r: 'oldrel-1'}
4040
- {os: ubuntu-latest, r: 'oldrel-2'}
4141
- {os: ubuntu-latest, r: 'oldrel-3'}
42-
- {os: ubuntu-latest, r: 'oldrel-4'}
42+
#- {os: ubuntu-latest, r: 'oldrel-4'}
4343

4444
env:
4545
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

‎DESCRIPTION

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Package: mobsim
22
Type: Package
33
Title: Spatial Simulation and Scale-Dependent Analysis of Biodiversity Changes
4-
Version: 0.3.0
4+
Version: 0.3.1
55
Authors@R: c(
66
person("Felix", "May", email = "[email protected]",
7-
role = c("aut", "cre"),
7+
role = c("aut", "cre","cph"),
88
comment = c(ORCID = "0000-0002-1106-8188")),
99
person("Alban", "Sagouis", email = "[email protected]",
1010
role = "aut",
1111
comment = c(ORCID = "0000-0002-3827-1063"))
1212
)
13-
Date: 2023-12-12
13+
Date: 2024-03-11
1414
Description: Tools for the simulation, analysis and sampling of spatial
1515
biodiversity data (May, Gerstner, McGlinn, Xiao & Chase 2017)
1616
<doi:10.1101/209502>.
@@ -20,6 +20,8 @@ Description: Tools for the simulation, analysis and sampling of spatial
2020
and accumulation curves, species-area relationships and the distance
2121
decay of similarity.
2222
License: GPL (>= 3)
23+
Depends:
24+
R (>= 4.0.0)
2325
Imports:
2426
Rcpp,
2527
vegan,
@@ -45,4 +47,4 @@ RoxygenNote: 7.3.1
4547
Language: en-GB
4648
Encoding: UTF-8
4749
URL: https://github.com/MoBiodiv/mobsim
48-
BugReports: https://github.com/MoBiodiv/mobsim
50+
BugReports: https://github.com/MoBiodiv/mobsim/issues

‎NEWS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mobsim 0.3.0
1+
mobsim 0.3.1
22
================================================================================
33

44
### POTENTIAL CODE BREAK

‎R/mobsim.R

-45
This file was deleted.

‎R/mobsim_package.R

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#' mobsim: A package for spatial analysis of scale-dependent biodiversity changes.
2+
#'
3+
#' @description
4+
#' The package includes functions to simulate species distributions in space
5+
#' as well as for the analysis of spatially-explicit data, where each individual
6+
#' is described by its xy-coordinates and a species identity label.
7+
#'
8+
#' @keywords internal
9+
#'
10+
"_PACKAGE"
11+
NULL
12+
13+
#' @useDynLib mobsim, .registration = TRUE
14+
#' @importFrom Rcpp sourceCpp
15+
NULL

‎codemeta.json

+26-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"@context": "https://doi.org/10.5063/schema/codemeta-2.0",
33
"@type": "SoftwareSourceCode",
44
"identifier": "mobsim",
5-
"description": "Tools for the simulation, analysis and sampling of spatial biodiversity data (May et al. 2017) <doi:10.1101/209502>. In the simulation tools user define the numbers of species and individuals, the species abundance distribution and species aggregation. Functions for analysis include species rarefaction and accumulation curves, species-area relationships and the distance decay of similarity. ",
5+
"description": "Tools for the simulation, analysis and sampling of spatial biodiversity data (May, Gerstner, McGlinn, Xiao & Chase 2017) <doi:10.1101/209502>. In the simulation tools user define the numbers of species and individuals, the species abundance distribution and species aggregation. Functions for analysis include species rarefaction and accumulation curves, species-area relationships and the distance decay of similarity. ",
66
"name": "mobsim: Spatial Simulation and Scale-Dependent Analysis of Biodiversity Changes",
77
"codeRepository": "https://github.com/MoBiodiv/mobsim",
8-
"issueTracker": "https://github.com/MoBiodiv/mobsim",
8+
"issueTracker": "https://github.com/MoBiodiv/mobsim/issues",
99
"license": "https://spdx.org/licenses/GPL-3.0",
10-
"version": "0.3.0",
10+
"version": "0.3.1",
1111
"programmingLanguage": {
1212
"@type": "ComputerLanguage",
1313
"name": "R",
@@ -30,6 +30,15 @@
3030
"@id": "https://orcid.org/0000-0002-3827-1063"
3131
}
3232
],
33+
"copyrightHolder": [
34+
{
35+
"@type": "Person",
36+
"givenName": "Felix",
37+
"familyName": "May",
38+
"email": "[email protected]",
39+
"@id": "https://orcid.org/0000-0002-1106-8188"
40+
}
41+
],
3342
"maintainer": [
3443
{
3544
"@type": "Person",
@@ -116,6 +125,12 @@
116125
],
117126
"softwareRequirements": {
118127
"1": {
128+
"@type": "SoftwareApplication",
129+
"identifier": "R",
130+
"name": "R",
131+
"version": ">= 4.0.0"
132+
},
133+
"2": {
119134
"@type": "SoftwareApplication",
120135
"identifier": "Rcpp",
121136
"name": "Rcpp",
@@ -127,7 +142,7 @@
127142
},
128143
"sameAs": "https://CRAN.R-project.org/package=Rcpp"
129144
},
130-
"2": {
145+
"3": {
131146
"@type": "SoftwareApplication",
132147
"identifier": "vegan",
133148
"name": "vegan",
@@ -139,7 +154,7 @@
139154
},
140155
"sameAs": "https://CRAN.R-project.org/package=vegan"
141156
},
142-
"3": {
157+
"4": {
143158
"@type": "SoftwareApplication",
144159
"identifier": "sads",
145160
"name": "sads",
@@ -152,34 +167,34 @@
152167
},
153168
"sameAs": "https://CRAN.R-project.org/package=sads"
154169
},
155-
"4": {
170+
"5": {
156171
"@type": "SoftwareApplication",
157172
"identifier": "grDevices",
158173
"name": "grDevices"
159174
},
160-
"5": {
175+
"6": {
161176
"@type": "SoftwareApplication",
162177
"identifier": "utils",
163178
"name": "utils"
164179
},
165-
"6": {
180+
"7": {
166181
"@type": "SoftwareApplication",
167182
"identifier": "graphics",
168183
"name": "graphics"
169184
},
170-
"7": {
185+
"8": {
171186
"@type": "SoftwareApplication",
172187
"identifier": "stats",
173188
"name": "stats"
174189
},
175-
"8": {
190+
"9": {
176191
"@type": "SoftwareApplication",
177192
"identifier": "methods",
178193
"name": "methods"
179194
},
180195
"SystemRequirements": null
181196
},
182-
"fileSize": "2317.916KB",
197+
"fileSize": "6348.454KB",
183198
"citation": [
184199
{
185200
"@type": "ScholarlyArticle",

‎cran-comments.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ removing the dependency on spatstat.core and using spatstat.random and
77
spatstat.geom instead.
88
* Fixed inst/CITATION and DESCRIPTION
99
* Added features to major functions
10+
* Added Depends R >= 4.0.0 because mobsim depends on sads which itself depends on VGAM which depends on R 4.0.0.
1011

1112
## Test environments
13+
1214
* local - Darwin, R 4.3.1
1315
* win-builder (release and devel)
1416
* r hub - Ubuntu Linux 20.04.1 LTS, R-release, GCC
1517
* r hub - Fedora Linux, R-devel, clang, gfortran
1618

1719
## R CMD check results
18-
0 errors | 1 warnings | 0 notes
20+
21+
0 errors | 0 warnings | 0 notes
1922

2023
We ran revdepcheck::revdep_check() locally and no packages depend on mobsim
2124
any more.

‎man/mobsim-package.Rd

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/mobsim.Rd

-55
This file was deleted.

‎mobsim.Rproj

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Version: 1.0
2+
3+
RestoreWorkspace: Default
4+
SaveWorkspace: Default
5+
AlwaysSaveHistory: Default
6+
7+
EnableCodeIndexing: Yes
8+
UseSpacesForTab: Yes
9+
NumSpacesForTab: 2
10+
Encoding: UTF-8
11+
12+
RnwWeave: Sweave
13+
LaTeX: pdfLaTeX
14+
15+
AutoAppendNewline: Yes
16+
17+
BuildType: Package
18+
PackageUseDevtools: Yes
19+
PackageInstallArgs: --no-multiarch --with-keep.source
20+
PackageRoxygenize: rd,collate,namespace,vignette

‎tests/testthat/Rplots.pdf

18.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)