Skip to content

Commit 06b9c80

Browse files
committed
Merge branch 'master' into testing
2 parents 3b22f24 + e1f9806 commit 06b9c80

File tree

17 files changed

+165
-182
lines changed

17 files changed

+165
-182
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ jobs:
2121
- {os: macOS-latest, r: 'release'}
2222
- {os: windows-latest, r: 'release'}
2323
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
24-
- {os: ubuntu-latest, r: 'release'}
2524

2625
env:
2726
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2827
R_KEEP_PKG_SOURCE: yes
2928

3029
steps:
31-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v4
3231

3332
- uses: r-lib/actions/setup-pandoc@v2
3433

.github/workflows/test-coverage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- uses: r-lib/actions/setup-r@v2
2121
with:
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Upload test results
5151
if: failure()
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: coverage-test-failures
5555
path: ${{ runner.temp }}/package

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: stelfi
22
Type: Package
33
Title: Hawkes and Log-Gaussian Cox Point Processes Using Template Model Builder
4-
Version: 1.0.1
5-
Date: 2023-09-29
4+
Version: 1.0.2
5+
Date: 2025-08-12
66
Authors@R:
77
c(person(given = "Charlotte M.",
88
family = "Jones-Todd",
@@ -29,7 +29,7 @@ Authors@R:
2929
family = "FA2386-21-1-4028",
3030
role = "fnd"))
3131
Depends:
32-
R (>= 4.3.0)
32+
R (>= 4.5.0)
3333
Imports:
3434
TMB (>= 1.9.6),
3535
sf (>= 1.0.14),
@@ -49,7 +49,7 @@ BugReports: https://github.com/cmjt/stelfi/issues
4949
LazyData: TRUE
5050
LazyDataCompression: xz
5151
Encoding: UTF-8
52-
RoxygenNote: 7.2.3
52+
RoxygenNote: 7.3.2
5353
Suggests:
5454
testthat (>= 3.1.10),
5555
rmarkdown,

NEWS.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# stelfi (development version)
22

3+
# stelfi 1.0.2
4+
5+
## Breaking changes
6+
7+
+ None
8+
9+
## New features
10+
11+
+ None
12+
13+
## Minor improvements and fixes
14+
15+
+ fixing CRAN NOTE for CRAN (re)release
16+
17+
318
# stelfi 0.0.3
419

520
## Breaking changes

R/data.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ NULL
9292
#' \item{luminosity}{scaled: luminosity}
9393
#' \item{tt}{scaled: time to nearest city in minutes}
9494
#' }
95-
#' @source \url{https://www.start.umd.edu/gtd/}
95+
#' @source \url{https://www.start.umd.edu/data-tools/GTD}
9696
#' @name iraq_terrorism
9797
NULL
9898
#' Example marked point pattern data set

R/stelfi.r

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#' @references Kristensen, K., Nielsen, A., Berg, C. W., Skaug, H., and
4646
#' Bell B. M. (2016). {TMB}: Automatic Differentiation and Laplace
4747
#' Approximation. \emph{Journal of Statistical Software}, \strong{70}: 1--21.
48-
#' @docType package
49-
#' @aliases stelfi-package
50-
#' @name stelfi
48+
#' @keywords internal
49+
"_PACKAGE"
5150
NULL

cran-comments.md

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,42 @@
1-
## Resubmission
1+
## New submission
22

3-
This is a resubmission. In this version I have:
4-
5-
* Removed, now, broken link from `man/uk_serial.Rd`
6-
* Fixed the M1mac issue as requested by Prof Brian Ripley
3+
Package was archived on CRAN on 2025-04-02
74

5+
Apologies for not fixing issue in time to maintain continued hosting on CRAN.
6+
The issue related to the INFO note below, which
7+
was previously piaked up as a NOTE. As noted the sub-directory in questions
8+
is created when the C++ template, required for its functionality, is compiled.
89

910
## Test environments
1011

1112
* ubuntu-latest (release & devel)
12-
* local ubuntu 18.04 & 20.04
13+
* local ubuntu 20.04
1314
* windows-latest (release)
1415
* macos-latest (release)
1516

1617
## R CMD check results
1718

1819
* No ERRORs or WARNINGs
20+
21+
The following NOTE was received
22+
23+
* Maintainer: ‘Charlotte M. Jones-Todd <[email protected]>
24+
25+
New submission
26+
27+
Package was archived on CRAN
28+
29+
CRAN repository db overrides:
30+
X-CRAN-Comment: Archived on 2025-04-02 as issues were not corrected
31+
in time
32+
1933

20-
On all tests the following NOTE was received
34+
The following INFO was received
2135

22-
* checking installed package size ... NOTE
23-
installed size is 62.7Mb
24-
sub-directories of 1Mb or more:
25-
libs 61.5Mb
36+
* checking installed package size ... INFO
37+
installed size is 84.5Mb
38+
sub-directories of 1Mb or more:
39+
libs 83.2Mb
2640

2741
* This sub-directory is created when the C++ template, required for its functionality, is compiled.
2842

docs/data.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ <h3 class="unnumbered anchored" data-anchor-id="retweets_niwa"><code>retweets_ni
287287
<p>In 2019 a <a href="https://niwa.co.nz/">NIWA</a> scientist <a href="https://www.nzherald.co.nz/nz/news/article.cfm?c_id=1&amp;objectid=12201147">found a working USB in the scat of a leopard seal</a>, they then <a href="https://twitter.com/niwa_nz/status/1092610541401587712">tweeted about it</a> in the hopes of finding its owner. In <a href="#hawkes">this chapter</a> a Hawkes process is fitted to these data.</p>
288288
<div class="cell">
289289
<div class="cell-output-display">
290-
<blockquote class="twitter-tweet blockquote" data-width="550" data-lang="en" data-dnt="true" data-theme="light"><p lang="en" dir="ltr">NIWA is searching for the owner of a USB stick found in the poo of a leopard seal… <br>Recognise this video? Scientists analysing the scat of leopard seals have come across an unexpected discovery – a USB stick full of photos &amp; still in working order! <a href="https://t.co/2SZVkm5az4">https://t.co/2SZVkm5az4</a> <a href="https://t.co/JLEC8vuHH0">pic.twitter.com/JLEC8vuHH0</a></p>NIWA (@niwa_nz) <a href="https://twitter.com/niwa_nz/status/1092610541401587712?ref_src=twsrc%5Etfw">February 5, 2019</a></blockquote>
290+
<blockquote class="twitter-tweet blockquote" data-width="550" data-lang="en" data-dnt="true" data-theme="light"><p lang="en" dir="ltr">NIWA is searching for the owner of a USB stick found in the poo of a leopard seal… <br>Recognise this video? Scientists analysing the scat of leopard seals have come across an unexpected discovery – a USB stick full of photos &amp; still in working order! <a href="https://t.co/2SZVkm5az4">https://t.co/2SZVkm5az4</a> <a href="https://t.co/JLEC8vuHH0">pic.twitter.com/JLEC8vuHH0</a></p>Earth Sciences New Zealand (@earthsciencesnz) <a href="https://twitter.com/earthsciencesnz/status/1092610541401587712?ref_src=twsrc%5Etfw">February 5, 2019</a></blockquote>
291291

292292
</div>
293293
</div>

0 commit comments

Comments
 (0)