aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2022-11-11 10:37:13 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2022-11-11 10:37:13 +0100
commit60a217ecc9a035ab956bd4229da6ad4c654e7d6e (patch)
tree2b54aadd6c5e0944943310b3cd7192b62661ef95
parent3ef243d18b7972eb8cb4a561ac07d93b46df13a5 (diff)
Remove Remotes: field from DESCRIPTION
It causes trouble with remotes::install_deps() on travis, see the various previous build logs.
-rw-r--r--.travis.yml1
-rw-r--r--ChangeLog75
-rw-r--r--DESCRIPTION1
-rw-r--r--NAMESPACE1
-rw-r--r--R/TOXSWA_cwa.R3
-rw-r--r--man/PEC_soil.Rd2
6 files changed, 79 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index dc26905..3f3eafb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ before_install:
- ./run.sh bootstrap
install:
- - Rscript -e "utils::download.file('https://api.github.com/repos/jranke/chents/contents/DESCRIPTION?ref=HEAD', destfile = 'tmp.json')"
- ./run.sh install_deps
script:
diff --git a/ChangeLog b/ChangeLog
index 8a0babe..ae0a684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+commit 3ef243d18b7972eb8cb4a561ac07d93b46df13a5
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-11 10:06:39 +0100
+
+ Fix call to download.file for debugging
+
+commit 9f977cb5d9657d0066598cda38908282dadae0c4
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-11 10:02:57 +0100
+
+ Try to debug the failure in remotes::install_deps
+
+commit 6681356b8abab27f0735341ed6d3a44e1374e2e5
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-11 09:00:41 +0100
+
+ Typo, remove PELMO related suggestions
+
+ PELMO related functions are not used in pfm, so apart from advertising,
+ these suggestions did not do anything.
+
+commit 3e82035d2753d031401f80833de8939740491bd0
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 17:17:03 +0100
+
+ Revert standalone option for remotes on travis
+
+commit 9f28f36b00c156ff9c78790302c6fc74e0195651
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 16:48:27 +0100
+
+ Yet another attempt on remotes on travis
+
+commit 4f315619d56a191a80d2223913ee976d96ae5f97
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 16:43:39 +0100
+
+ Another attempt to make remotes work on travis
+
+commit 8d03f6ae52e6c45e3da93e41b15eb5f853ab6d17
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 16:35:33 +0100
+
+ Try to make remotes work
+
+commit e46ee27b218dde8ebb948e8b3b28e9cd8250bc70
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 16:27:12 +0100
+
+ Skip BSPM, it's the default
+
+commit f41d1759b890613895879f36e69e9928dd517f0e
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 15:49:36 +0100
+
+ Only install dependencies, as chents fails to install
+
+commit 7a54d9b65fc55e28411126b97c542fb4c180c0a7
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 15:43:43 +0100
+
+ Use Dirks run.sh on travis
+
+commit a0364c2561dda4c4b67e7e3b6830719b4ed60916
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2022-11-10 12:17:34 +0100
+
+ set_nd_nq is now in mkin, fix Steps12 bug
+
+ If a scenario with a slash "/" was selected in PEC_sw_focus(),
+ the Step 2 file generated giving an error (path not found) in the
+ Steps12 calculator, because the scenario name is part of the "compound"
+ name in this implementation, in order to show it in the list that the
+ calculator presents.
+
commit aa0c59c7a3ede267730fe85f9e27b1814f9e897a
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2021-11-19 00:18:41 +0100
diff --git a/DESCRIPTION b/DESCRIPTION
index 890d606..86a798a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -22,7 +22,6 @@ Suggests:
grImport,
magrittr,
covr
-Remotes: jranke/chents
License: GPL
LazyLoad: yes
LazyData: yes
diff --git a/NAMESPACE b/NAMESPACE
index 8b44855..e24d712 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -46,6 +46,7 @@ export(soil_sorption)
export(twa)
import(graphics)
import(mkin)
+importFrom(R6,R6Class)
importFrom(grDevices,dev.cur)
importFrom(methods,is)
importFrom(mkin,mkinpredict)
diff --git a/R/TOXSWA_cwa.R b/R/TOXSWA_cwa.R
index 6521349..310029e 100644
--- a/R/TOXSWA_cwa.R
+++ b/R/TOXSWA_cwa.R
@@ -27,6 +27,7 @@ if(getRversion() >= '2.15.1') utils::globalVariables(c("cwa"))
#' generating event statistics.
#' @importFrom readr read_fwf fwf_empty
#' @importFrom grDevices dev.cur
+#' @importFrom R6 R6Class
#' @return An instance of an R6 object of class
#' \code{\link{TOXSWA_cwa}}.
#' @export
@@ -169,7 +170,7 @@ plot.TOXSWA_cwa <- function(x, time_column = c("datetime", "t", "t_firstjan", "t
#' H_sw_R1_stream$moving_windows(c(7, 21))
#' print(H_sw_R1_stream)
#' @keywords data
-TOXSWA_cwa <- R6Class("TOXSWA_cwa",
+TOXSWA_cwa <- R6::R6Class("TOXSWA_cwa",
public = list(
filename = NULL,
basedir = NULL,
diff --git a/man/PEC_soil.Rd b/man/PEC_soil.Rd
index a198f24..e7efd6c 100644
--- a/man/PEC_soil.Rd
+++ b/man/PEC_soil.Rd
@@ -88,7 +88,7 @@ as Kom here}
and soil properties as specified in the REACH guidance (R.16, Table
R.16-9) are used for porewater PEC calculations. If this is "EFSA_2015",
the DT50 is taken to be a modelling half-life at 20°C and pF2 (for when
-'chents' is specified, the DegT50 with destination 'PECgw' will be used),
+'chent' is specified, the DegT50 with destination 'PECgw' will be used),
and corrected using an Arrhenius activation energy of 65.4 kJ/mol. Also
model and scenario adjustment factors from the EFSA guidance are used.}

Contact - Imprint