Skip to content

Commit

Permalink
Merge pull request #192 from SCasanova/devtest
Browse files Browse the repository at this point in the history
Advance lifecycle anf CRAN comments
  • Loading branch information
SCasanova committed Oct 2, 2023
2 parents e5ffb2b + e64b016 commit 3dfa293
Show file tree
Hide file tree
Showing 67 changed files with 566 additions and 120 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: f1dataR
Title: Access Formula 1 Data
Version: 1.3.0.9000
Version: 1.4.0
Authors@R: c(
person("Santiago", "Casanova", , "santiago.casanova@yahoo.com", role = c("aut", "cre", "cph")),
person("Philip", "Bulsink", , "bulsinkp@gmail.com", role = "aut",
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# f1dataR (development version)
# f1dataR 1.4.0

* Added a function `correct_track_ratio()` to ensure plotted tracks have proper x & y ratios (#89, #179)
* Updated `plot_fastest()` to use `correct_track_ratio()`
Expand Down
8 changes: 4 additions & 4 deletions R/load_driver_telemetry.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ load_driver_telemetry <- function(season = get_current_season(), round = 1, sess
fastest_only = lifecycle::deprecated()) {
# Lifecycles
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "load_driver_telemetry(race)", "load_driver_telemetry(round)")
lifecycle::deprecate_stop("1.4.0", "load_driver_telemetry(race)", "load_driver_telemetry(round)")
round <- race
}
if (lifecycle::is_present(fastest_only)) {
lifecycle::deprecate_warn("1.1.0", "load_driver_telemetry(fastest_only)", "load_driver_telemetry(laps)")
lifecycle::deprecate_stop("1.4.0", "load_driver_telemetry(fastest_only)", "load_driver_telemetry(laps)")
if (fastest_only) {
laps <- "fastest"
} else {
Expand Down Expand Up @@ -130,8 +130,8 @@ get_driver_telemetry <-
log_level = "WARNING",
fastest_only = lifecycle::deprecated(),
race = lifecycle::deprecated()) {
lifecycle::deprecate_warn(
"1.0.0",
lifecycle::deprecate_stop(
"1.4.0",
"get_driver_telemetry()",
"load_driver_telemetry()"
)
Expand Down
2 changes: 1 addition & 1 deletion R/load_laps.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#' during lap, time (in clock form), lap number, time (in seconds), and season.
load_laps <- function(season = get_current_season(), round = "last", race = lifecycle::deprecated()) {
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "load_laps(race)", "load_laps(round)")
lifecycle::deprecate_stop("1.4.0", "load_laps(race)", "load_laps(round)")
round <- race
}
if (season != "current" && (season < 1996 || season > get_current_season())) {
Expand Down
2 changes: 1 addition & 1 deletion R/load_pitstops.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#' and stop duration
load_pitstops <- function(season = get_current_season(), round = "last", race = lifecycle::deprecated()) {
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "load_pitstops(race)", "load_pitstops(round)")
lifecycle::deprecate_stop("1.4.0", "load_pitstops(race)", "load_pitstops(round)")
round <- race
}
if (season != "current" && (season < 2011 || season > get_current_season())) {
Expand Down
2 changes: 1 addition & 1 deletion R/load_race_session.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
load_race_session <- function(obj_name = "session", season = get_current_season(), round = 1, session = "R",
log_level = "WARNING", race = lifecycle::deprecated()) {
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "load_race_session(race)", "load_race_session(round)")
lifecycle::deprecate_stop("1.4.0", "load_race_session(race)", "load_race_session(round)")
round <- race
}
if (season != "current" && (season < 2018 || season > get_current_season())) {
Expand Down
2 changes: 1 addition & 1 deletion R/load_session_laps.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
load_session_laps <- function(season = get_current_season(), round = 1, session = "R", log_level = "WARNING",
add_weather = FALSE, race = lifecycle::deprecated()) {
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "load_session_laps(race)", "load_session_laps(round)")
lifecycle::deprecate_stop("1.4.0", "load_session_laps(race)", "load_session_laps(round)")
round <- race
}

Expand Down
6 changes: 5 additions & 1 deletion R/plot_fastest.R
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ plot_fastest <- function(season = get_current_season(), round = 1, session = "R"
cli::cli_abort("f1dataR::plot_fastest() requires ggplot2 package installation")
}
if (lifecycle::is_present(race)) {
lifecycle::deprecate_warn("1.0.0", "plot_fastest(race)", "plot_fastest(round)")
lifecycle::deprecate_stop(
"1.4.0",
"plot_fastest(race)",
"plot_fastest(round)"
)
round <- race
}

Expand Down
10 changes: 3 additions & 7 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
## Resubmission
This is a resubmission. In this version we have:

* Fixed an undiscovered bug in previous sumbission
* Added freedom to the usesr's python enviroment

* Eliminated any use of `getwd()` within the package (functions, tests and vignettes)
* Advanced lifecycle on deprecations

* Changed the caching process to give control to user (use `tempdir()` as default)

* Added missing value parameters

* Added API references to DESCRIPTION
* Added a helper function for plot outputs

## R CMD check results

2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-drivers_laptimes-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-grid_to_finish_one-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-grid_to_finish_season-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-quali_compare-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-round_position-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/ergast-data-analysis-rounds_points-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/articles/ergast-data-analysis.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/articles/introduction-pitstop-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-session_laps-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-simple_plot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-telem_plotting-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-triple_plot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-use_builtin-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/introduction-use_theme-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 24 additions & 17 deletions docs/articles/introduction.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/setup_fastf1.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3dfa293

Please sign in to comment.