From 23c1dc7fca2abe161324aeee5d2f8310cdb0db66 Mon Sep 17 00:00:00 2001 From: Jeremy Raw Date: Tue, 23 Jan 2024 12:39:44 -0500 Subject: [PATCH] Updated package version to 3.1.1, require R > 4.0.0 --- sources/framework/VEModel/DESCRIPTION | 6 +++--- sources/framework/VEModel/R/export.R | 1 + sources/framework/VESnapshot/DESCRIPTION | 8 ++++---- sources/framework/visioneval/DESCRIPTION | 8 ++++---- sources/modules/VE2001NHTS/DESCRIPTION | 8 ++++---- sources/modules/VEHouseholdTravel/DESCRIPTION | 8 ++++---- sources/modules/VEHouseholdVehicles/DESCRIPTION | 8 ++++---- sources/modules/VELandUse/DESCRIPTION | 8 ++++---- sources/modules/VEPowertrainsAndFuels/DESCRIPTION | 8 ++++---- sources/modules/VERPAT/DESCRIPTION | 8 ++++---- sources/modules/VESimHouseholds/DESCRIPTION | 8 ++++---- sources/modules/VESimLandUse/DESCRIPTION | 8 ++++---- sources/modules/VESimLandUseData/DESCRIPTION | 8 ++++---- sources/modules/VESimTransportSupply/DESCRIPTION | 8 ++++---- sources/modules/VEState/DESCRIPTION | 8 ++++---- sources/modules/VESyntheticFirms/DESCRIPTION | 8 ++++---- sources/modules/VETransportSupply/DESCRIPTION | 8 ++++---- sources/modules/VETransportSupplyUse/DESCRIPTION | 8 ++++---- sources/modules/VETravelDemandMM/DESCRIPTION | 8 ++++---- sources/modules/VETravelPerformance/DESCRIPTION | 8 ++++---- 20 files changed, 76 insertions(+), 75 deletions(-) diff --git a/sources/framework/VEModel/DESCRIPTION b/sources/framework/VEModel/DESCRIPTION index ca8137d7d..e0d51e7e2 100644 --- a/sources/framework/VEModel/DESCRIPTION +++ b/sources/framework/VEModel/DESCRIPTION @@ -1,8 +1,8 @@ Package: VEModel Type: Package Title: Utilities for Managing VisionEval Models and Samples -Version: 3.1.0 -Date: 2021-01-19 +Version: 3.1.1 +Date: 2024-01-23 Author: Jeremy Raw [aut, cre] Maintainer: Jeremy Raw Copyright: None @@ -10,7 +10,7 @@ Description: Contains R6 object management code providing functions and objects to set up VisionEval models, run them, and query or extract their output. License: file LICENSE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, R6, diff --git a/sources/framework/VEModel/R/export.R b/sources/framework/VEModel/R/export.R index a45a962eb..d60506709 100644 --- a/sources/framework/VEModel/R/export.R +++ b/sources/framework/VEModel/R/export.R @@ -966,6 +966,7 @@ VEConnection.CSV <- R6::R6Class( #' @import DBI #' @import RSQLite #' @importFrom methods new +#' @importFrom utils install.packages ve.connection.dbi.init <- function(Model,config,reopen=FALSE,hive=FALSE) { super$initialize(Model,config,reopen,hive) # Two avenues here: diff --git a/sources/framework/VESnapshot/DESCRIPTION b/sources/framework/VESnapshot/DESCRIPTION index bfcc96c7d..c97b0654a 100644 --- a/sources/framework/VESnapshot/DESCRIPTION +++ b/sources/framework/VESnapshot/DESCRIPTION @@ -1,15 +1,15 @@ Package: VESnapshot Type: Package Title: Sample Module to take a snapshot of Datastore fields -Version: 3.1.0 -Date: 2022-12-12 +Version: 3.1.1 +Date: 2024-01-23 Author: Jeremy Raw [aut, cre] Maintainer: Jeremy Raw Copyright: None Description: Can be used in any VisionEval model to copy a Datastore field to a different field in the Datastore. License: file LICENSE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval Suggests: @@ -19,7 +19,7 @@ LazyData: TRUE LazyDataCompression: xz Encoding: UTF-8 VignetteBuilder: knitr -RoxygenNote: 7.2.2 +RoxygenNote: 7.2.3 Collate: parameters.R Snapshot.R diff --git a/sources/framework/visioneval/DESCRIPTION b/sources/framework/visioneval/DESCRIPTION index 8530e83c4..77d4e1cbe 100644 --- a/sources/framework/visioneval/DESCRIPTION +++ b/sources/framework/visioneval/DESCRIPTION @@ -1,8 +1,8 @@ Package: visioneval Type: Package Title: Software Framework for VisionEval Model System -Version: 3.1.0 -Date: 2020-08-14 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor ["aut", "cre"] Maintainer: Jeremy Raw Copyright: AASHTO, ODOT, Brian Gregor @@ -21,7 +21,7 @@ Description: This package defines all of the functions used to implement the initializing and managing the model run environment, managing the common datastore, and running modules. License: file LICENSE -Depends: R (>= 3.5) +Depends: R (>= 4.0.0) Imports: jsonlite, yaml, @@ -34,5 +34,5 @@ Suggests: pkgload Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.3 biocViews: Infrastructure diff --git a/sources/modules/VE2001NHTS/DESCRIPTION b/sources/modules/VE2001NHTS/DESCRIPTION index fc3176d55..e2356120c 100644 --- a/sources/modules/VE2001NHTS/DESCRIPTION +++ b/sources/modules/VE2001NHTS/DESCRIPTION @@ -1,8 +1,8 @@ Package: VE2001NHTS Type: Package Title: Create 2001 NHTS datasets for model estimation -Version: 3.1.0 -Date: 2020-08-14 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: AASHTO @@ -15,7 +15,7 @@ Description: This package creates and saves 3 data frames that are used to License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval Suggests: @@ -23,4 +23,4 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VEHouseholdTravel/DESCRIPTION b/sources/modules/VEHouseholdTravel/DESCRIPTION index 602f9e63b..56e07830a 100644 --- a/sources/modules/VEHouseholdTravel/DESCRIPTION +++ b/sources/modules/VEHouseholdTravel/DESCRIPTION @@ -1,8 +1,8 @@ Package: VEHouseholdTravel Type: Package Title: Calculate Household Walk, Bike, and Transit Trips -Version: 3.1.0 -Date: 2020-08-14 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Aditya Gore [cre] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO @@ -13,7 +13,7 @@ Description: Contains modules for predicting household average DVMT, trips by License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, data.table, @@ -24,4 +24,4 @@ Suggests: Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VEHouseholdVehicles/DESCRIPTION b/sources/modules/VEHouseholdVehicles/DESCRIPTION index 9410b6369..0be15677d 100644 --- a/sources/modules/VEHouseholdVehicles/DESCRIPTION +++ b/sources/modules/VEHouseholdVehicles/DESCRIPTION @@ -1,8 +1,8 @@ Package: VEHouseholdVehicles Type: Package Title: Model household vehicles with driver and vehicle adjustments -Version: 3.1.0 -Date: 2020-08-14 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Aditya Gore [cre] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO @@ -18,7 +18,7 @@ Description: This package contains modules which predict household vehicle License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, ordinal, @@ -29,4 +29,4 @@ Suggests: Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VELandUse/DESCRIPTION b/sources/modules/VELandUse/DESCRIPTION index a63a4256d..98e14ac15 100644 --- a/sources/modules/VELandUse/DESCRIPTION +++ b/sources/modules/VELandUse/DESCRIPTION @@ -1,8 +1,8 @@ Package: VELandUse Type: Package Title: Create Land Use Attributes for VE -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Aditya Gore [cre] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO @@ -18,7 +18,7 @@ Description: This package contains several modules which establish land use License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, geosphere, @@ -30,4 +30,4 @@ Suggests: Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VEPowertrainsAndFuels/DESCRIPTION b/sources/modules/VEPowertrainsAndFuels/DESCRIPTION index 7511f8ebe..7538e3d4d 100644 --- a/sources/modules/VEPowertrainsAndFuels/DESCRIPTION +++ b/sources/modules/VEPowertrainsAndFuels/DESCRIPTION @@ -1,8 +1,8 @@ Package: VEPowertrainsAndFuels Type: Package Title: Default Powertrains And Fuels for ODOT Adopted Plans scenario (xAP) -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: AASHTO, ODOT @@ -16,7 +16,7 @@ Description: Contains modules for inputting default powertrain and fuel fuel consumption. This is the "xAP" version, 2020-07-24. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, VEHouseholdTravel @@ -26,7 +26,7 @@ Suggests: Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: 'LoadDefaultValues.R' 'Initialize.R' diff --git a/sources/modules/VERPAT/DESCRIPTION b/sources/modules/VERPAT/DESCRIPTION index 461d24f72..4238a0748 100644 --- a/sources/modules/VERPAT/DESCRIPTION +++ b/sources/modules/VERPAT/DESCRIPTION @@ -1,8 +1,8 @@ Package: VERPAT Type: Package Title: Create reports for performance metrics using VE framework -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Aditya Gore [cre], Ben Stabler [cre], Brian Gregor [auth] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO, ODOT @@ -11,7 +11,7 @@ Description: This package contains modules that enable users to calculate VisionEval model run. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, VEHouseholdTravel @@ -20,6 +20,6 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: 'ReportRPATMetrics.R' diff --git a/sources/modules/VESimHouseholds/DESCRIPTION b/sources/modules/VESimHouseholds/DESCRIPTION index 94674da6e..277412194 100644 --- a/sources/modules/VESimHouseholds/DESCRIPTION +++ b/sources/modules/VESimHouseholds/DESCRIPTION @@ -1,8 +1,8 @@ Package: VESimHouseholds Type: Package Title: Create Simulated Households with Attributes for VE -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: AASHTO @@ -14,7 +14,7 @@ Description: This package contains several modules which create synthetic License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval Suggests: @@ -23,7 +23,7 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: 'CreateEstimationDatasets.R' 'CreateHouseholds.R' diff --git a/sources/modules/VESimLandUse/DESCRIPTION b/sources/modules/VESimLandUse/DESCRIPTION index 960d4e393..bcb3c1933 100644 --- a/sources/modules/VESimLandUse/DESCRIPTION +++ b/sources/modules/VESimLandUse/DESCRIPTION @@ -1,8 +1,8 @@ Package: VESimLandUse Type: Package Title: Create simulated Bzones (SimBzones) with attributes -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: AASHTO, ODOT @@ -13,7 +13,7 @@ Description: This package contains several modules which create simulated License: file LICENSE LazyData: TRUE LazyDataCompression: xz -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, plot3D, @@ -25,7 +25,7 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: CreateSimBzoneModels.R Initialize.R diff --git a/sources/modules/VESimLandUseData/DESCRIPTION b/sources/modules/VESimLandUseData/DESCRIPTION index 8ae8d2db4..66ef0f1b6 100644 --- a/sources/modules/VESimLandUseData/DESCRIPTION +++ b/sources/modules/VESimLandUseData/DESCRIPTION @@ -1,8 +1,8 @@ Package: VESimLandUseData Type: Package Title: Create dataset used for estimating land use simulation models -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: Oregon Department of Transportation @@ -14,7 +14,7 @@ Description: This package processes data from several sources to produce a License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, tidycensus, @@ -25,4 +25,4 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VESimTransportSupply/DESCRIPTION b/sources/modules/VESimTransportSupply/DESCRIPTION index b0a7c3380..70e005ddf 100644 --- a/sources/modules/VESimTransportSupply/DESCRIPTION +++ b/sources/modules/VESimTransportSupply/DESCRIPTION @@ -1,8 +1,8 @@ Package: VESimTransportSupply Type: Package Title: Create Transportation System Attributes for VE -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre] Maintainer: Jeremy Raw Copyright: AASHTO @@ -14,7 +14,7 @@ Description: This package contains several modules which attribute the in conjunction with the VESimLandUse package. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, VESimLandUse, @@ -24,4 +24,4 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VEState/DESCRIPTION b/sources/modules/VEState/DESCRIPTION index 4c01cb940..ab77cdf39 100644 --- a/sources/modules/VEState/DESCRIPTION +++ b/sources/modules/VEState/DESCRIPTION @@ -1,18 +1,18 @@ Package: VEState Type: Package Title: Implement the VE-State base model -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Aditya Gore [cre], Ben Stabler [cre], Brian Gregor [auth] Maintainer: Jeremy Raw Copyright: AASHTO, ODOT Description: This package contains the VE-State model, sample data and tutorials. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Suggests: rmarkdown, knitr VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 diff --git a/sources/modules/VESyntheticFirms/DESCRIPTION b/sources/modules/VESyntheticFirms/DESCRIPTION index 4916b6d52..bc0f26bab 100644 --- a/sources/modules/VESyntheticFirms/DESCRIPTION +++ b/sources/modules/VESyntheticFirms/DESCRIPTION @@ -1,8 +1,8 @@ Package: VESyntheticFirms TYPE: Package Title: VisionEval Synthetic Firms module for RPAT -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Ben Stabler , Peter Andrews , Brian Gregor Maintainer: Jeremy Raw Copyright: AASHTO @@ -10,7 +10,7 @@ Description: VisionEval Synthetic Firms module. License: file LICENSE LazyData: TRUE LazyDataCompression: bzip2 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, reshape @@ -18,7 +18,7 @@ Suggests: knitr VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: 'CreateBaseSyntheticFirms.R' 'CreateFutureSyntheticFirms.R' diff --git a/sources/modules/VETransportSupply/DESCRIPTION b/sources/modules/VETransportSupply/DESCRIPTION index 98e3c9d50..6970352d0 100644 --- a/sources/modules/VETransportSupply/DESCRIPTION +++ b/sources/modules/VETransportSupply/DESCRIPTION @@ -1,8 +1,8 @@ Package: VETransportSupply Type: Package Title: Create Transportation System Attributes for VE -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Aditya Gore [cre] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO @@ -13,7 +13,7 @@ Description: This package contains several modules which attribute the by vehicle type from transit revenue miles. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval Suggests: @@ -21,4 +21,4 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 \ No newline at end of file diff --git a/sources/modules/VETransportSupplyUse/DESCRIPTION b/sources/modules/VETransportSupplyUse/DESCRIPTION index 81ac48890..752ec626f 100644 --- a/sources/modules/VETransportSupplyUse/DESCRIPTION +++ b/sources/modules/VETransportSupplyUse/DESCRIPTION @@ -1,8 +1,8 @@ Package: VETransportSupplyUse Type: Package Title: Create Transport Supply Utilization Characteristics for VE -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Aditya Gore [cre], Ben Stabler [cre], Brian Gregor [auth] Maintainer: Jeremy Raw , Aditya Gore Copyright: AASHTO @@ -10,7 +10,7 @@ Description: This package contains modules that creates attributes for utilizati transportation supplies. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval Suggests: @@ -18,7 +18,7 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Collate: 'CalculateCongestionBase.R' 'CalculateCongestionFuture.R' diff --git a/sources/modules/VETravelDemandMM/DESCRIPTION b/sources/modules/VETravelDemandMM/DESCRIPTION index b7c37797c..b7adacc72 100644 --- a/sources/modules/VETravelDemandMM/DESCRIPTION +++ b/sources/modules/VETravelDemandMM/DESCRIPTION @@ -1,8 +1,8 @@ Package: VETravelDemandMM Type: Package Title: Simulate Multi-Modal Travel Demand for Households -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Authors@R: person("Liming", "Wang", role=c("aut", "cre"), email="lmwang@pdx.edu") Maintainer: Liming Wang Copyright: Portland State University @@ -11,7 +11,7 @@ Description: This package contains a module for the VisionEval framework that si License: file LICENSE LazyData: TRUE Encoding: UTF-8 -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: dplyr, purrr, @@ -27,7 +27,7 @@ Suggests: SLD VignetteBuilder: knitr Roxygen: list(load="source") -RoxygenNote: 7.1.0 +RoxygenNote: 7.2.3 Remotes: cities-lab/NHTS2009, cities-lab/SLD diff --git a/sources/modules/VETravelPerformance/DESCRIPTION b/sources/modules/VETravelPerformance/DESCRIPTION index 7fbd1da92..2c79881f0 100644 --- a/sources/modules/VETravelPerformance/DESCRIPTION +++ b/sources/modules/VETravelPerformance/DESCRIPTION @@ -1,8 +1,8 @@ Package: VETravelPerformance Type: Package Title: Balances cost and travel and calculates travel performance measures -Version: 3.1.0 -Date: 2023-01-04 +Version: 3.1.1 +Date: 2024-01-23 Author: Brian Gregor [aut, cre], Maintainer: Jeremy Raw Copyright: AASHTO @@ -16,7 +16,7 @@ Description: Contains modules for calculating fuel consumption, emissions, vehicles, heavy trucks, and public transit modes. License: file LICENSE LazyData: TRUE -Depends: R (>= 3.6.0) +Depends: R (>= 4.0.0) Imports: visioneval, dplyr, @@ -27,4 +27,4 @@ Suggests: VEHouseholdTravel Encoding: UTF-8 Roxygen: list(load='source') -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3