From df2226ee51eb62c846c9b24b261276c3b3fadf54 Mon Sep 17 00:00:00 2001
From: "Pavel N. Krivitsky"
Date: Sat, 9 Dec 2023 19:35:39 +1100
Subject: [PATCH] Forked a 4.6 release branch, truncated version number,
removed Remotes, updated citation, and set check flags.
---
.github/workflows/R-CMD-check.yaml | 10 +++++-----
DESCRIPTION | 4 +---
inst/CITATION | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 9f474ebdd..20f72de6f 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -77,11 +77,11 @@ jobs:
if [[ "${{ env.IAM }}" == 'public' ]] # Public: full set.
then
config='{"config":[
- {"os":"windows-latest", "r":"release", "timeout":360, "flags":"binaries"},
- {"os":"macOS-latest", "r":"release", "timeout":360, "flags":"binaries, ubsan"},
- {"os":"ubuntu-latest", "r":"release", "timeout":360, "flags":"full, ubsan, debug"},
- {"os":"ubuntu-latest", "r":"devel", "timeout":360, "flags":"vignettes, remote"},
- {"os":"ubuntu-latest", "r":"release", "timeout":360, "flags":"full, covr"}]}'
+ {"os":"windows-latest", "r":"release", "timeout":360, "flags":"vignettes, binaries, strict, remote"},
+ {"os":"macOS-latest", "r":"release", "timeout":360, "flags":"vignettes, binaries, ubsan, strict, remote"},
+ {"os":"ubuntu-latest", "r":"release", "timeout":360, "flags":"vignettes, full, ubsan, debug, strict"},
+ {"os":"ubuntu-latest", "r":"devel", "timeout":360, "flags":"vignettes, remote, strict"},
+ {"os":"ubuntu-latest", "r":"release", "timeout":360, "flags":"full, covr, strict"}]}'
elif [[ "${{ env.FOUND_PUBLIC }}" != '0' ]] # Private with no public analogue: reduced set.
then
config='{"config":[
diff --git a/DESCRIPTION b/DESCRIPTION
index f6c5e8951..ae4fcd61f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: ergm
-Version: 4.6-7282
+Version: 4.6.0
Date: 2023-12-09
Title: Fit, Simulate and Diagnose Exponential-Family Models for Networks
Authors@R: c(
@@ -187,5 +187,3 @@ Collate:
'vcov.ergm.R'
'wtd.median.R'
'zzz.R'
-Remotes: github::statnet/statnet.common@master,
- github::statnet/ergm.count@master
diff --git a/inst/CITATION b/inst/CITATION
index a4f307003..328fb05e5 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -21,8 +21,8 @@ bibentry("Manual", author = structure(list(list(given = c("Mark",
comment = NULL)), class = "person"), title = paste("ergm",
": ", gsub("\n", " ", "Fit, Simulate and Diagnose Exponential-Family Models for Networks",
fixed = TRUE), sep = ""), organization = paste0("The Statnet Project (\\url{",
- "https://statnet.org", "})"), year = substr("2023-05-10",
- 1, 4), note = paste("R package version ", "4.5-7213", sep = ""),
+ "https://statnet.org", "})"), year = substr("2023-12-09",
+ 1, 4), note = paste("R package version ", "4.6.0", sep = ""),
url = paste0("https://CRAN.R-project.org/package=", "ergm"))
# ---- END AUTOGENERATED STATNET CITATION ----