Remove deps #20 (#23)

- remove berryFunctions, glue, stringr from IMPORT dependencies
- edit lintr GHA workflow
- increment package version
- edit NEWS.md with changes in branch

references #20

Author: Ryo-N7

.github/workflows/lint.yaml

@@ -1,27 +1,25 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
-# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   pull_request:
-    branches: [main, master]
+    branches:
+      - main
+      - master
 
 name: lint-changed-files
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
+  lint-changed-files:
+    runs-on: ubuntu-20.04
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
-        with:
-          use-public-rspm: true
-
+      - uses: r-lib/actions/setup-r@v2
+      
       - uses: r-lib/actions/setup-r-dependencies@v1
         with:
           extra-packages: lintr
-          
+
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
@@ -37,3 +35,5 @@ jobs:
           exclusions_list <- as.list(setdiff(all_files, changed_files))
           lintr::lint_package(exclusions = exclusions_list)
         shell: Rscript {0}
+        
+        

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggshakeR
 Title: Analytics and Visualization Package for Soccer Data
-Version: 0.1.1
+Version: 0.1.2
 Authors@R: c(
     person(given = "Abhishek Amol",
            family = "Mishra",
@@ -20,24 +20,19 @@ Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.1.2
 Imports:
   tidyr,
-  devtools,
   magrittr,
   dplyr,
   ggplot2,
   ggsoccer,
   ggrepel,
   viridis,
-  roxygen2,
   ggtext,
   Rcpp,
   RcppRoll,
   TTR,
   stringi, 
-  stringr, 
   forcats,
-  wesanderson,
-  glue,
-  berryFunctions
+  wesanderson
 Suggests: 
     rmarkdown,
     knitr,

NAMESPACE

@@ -19,10 +19,8 @@ import(ggplot2)
 import(ggrepel)
 import(ggsoccer)
 import(ggtext)
-import(stringi)
-import(stringr)
 import(viridis)
 import(wesanderson)
-importFrom(berryFunctions,insertRows)
-importFrom(glue,glue)
 importFrom(magrittr,"%>%")
+importFrom(stringi,stri_trans_general)
+importFrom(stringi,stri_wrap)

NEWS.md

@@ -1,3 +1,8 @@
+# ggshakeR 0.1.2
+
+* Remove extraneous dependencies from package imports
+  * See [issue #20](https://github.com/abhiamishra/ggshakeR/issues/20)
+
 # ggshakeR 0.1.1
 
 * Implement Github Actions CI tools:

R/plot_pizza.R

@@ -27,8 +27,7 @@
 #' @import ggplot2
 #' @import forcats
 #' @import ggtext
-#' @import stringr
-#' @import stringi
+#' @importFrom stringi stri_wrap stri_trans_general
 #'
 #' @export
 #'
@@ -364,7 +363,7 @@ Data from StatsBomb via FBref. Inspired by @NathanAClark. Created using ggshakeR
             plot.caption = element_text(hjust = 0.5, size = 15, colour = colorText),
             panel.grid.major = element_blank(),
             panel.grid.minor = element_blank()) +
-      scale_x_discrete(labels = function(x) str_wrap(x, width = 10))
+      scale_x_discrete(labels = function(x) stri_wrap(x, width = 10))
 
   } else if (type == "comparison") { ## COMPARISON PLOT ----
 
@@ -539,6 +538,6 @@ Data from StatsBomb via FBref. Inspired by @FootballSlices. Created using ggshak
             plot.caption = element_text(hjust = 0.5, size = 15, colour = colorText),
             panel.grid.major = element_blank(),
             panel.grid.minor = element_blank()) +
-      scale_x_discrete(labels = function(x) str_wrap(x, width = 10))
+      scale_x_discrete(labels = function(x) stri_wrap(x, width = 10))
   }
 }

R/plot_timeline.r

@@ -14,9 +14,7 @@
 #' @import dplyr
 #' @import ggtext
 #' @import ggplot2
-#' @importFrom berryFunctions insertRows
 #' @import ggrepel
-#' @importFrom glue glue
 #'
 #' @export
 #'
@@ -75,35 +73,44 @@ plot_timeline <- function(data, match_year, team_home, team_away, home_color, aw
   }
 
   data <- data %>%
-    filter(season == match_year)
+    dplyr::filter(season == match_year)
 
   if (!"home_away" %in% colnames(data)) {
     data <- data %>%
       mutate(home_away = h_a)
   }
 
   data <- data %>%
-    filter(home_team == team_home,
+    dplyr::filter(home_team == team_home,
            away_team == team_away)
   data1 <- data %>%
-    filter(home_away == "h") %>%
+    dplyr::filter(home_away == "h") %>%
     mutate(xGsum = cumsum(xG))
   data2 <- data %>%
-    filter(home_away == "a") %>%
+    dplyr::filter(home_away == "a") %>%
     mutate(xGsum = cumsum(xG))
 
-  data1 <- insertRows(data1, 1, new = 0)
-  data2 <- insertRows(data2, 1, new = 0)
+  # data1 <- insertRows(data1, 1, new = 0)
+  # data2 <- insertRows(data2, 1, new = 0)
+  data1 <- dplyr::add_row(.data = data1, .before = 1, 
+                           id = "0", minute = 0, result = "0", X = 0, Y = 0, xG = 0, player = "0", home_away = "0", player_id = "0",
+                           situation = "0", season = "0", shotType = "0", match_id = "0", home_team = "0", away_team = "0",
+                           home_goals = 0, away_goals = 0, date = "0", player_assisted = "0", lastAction = "0", xGsum = 0)
+  
+  data2 <- dplyr::add_row(.data = data2, .before = 1, 
+                           id = "0", minute = 0, result = "0", X = 0, Y = 0, xG = 0, player = "0", home_away = "0", player_id = "0",
+                           situation = "0", season = "0", shotType = "0", match_id = "0", home_team = "0", away_team = "0",
+                           home_goals = 0, away_goals = 0, date = "0", player_assisted = "0", lastAction = "0", xGsum = 0)
 
   dat1 <- data1 %>%
-    filter(result == "Goal")
+    dplyr::filter(result == "Goal")
   d1 <- data1 %>%
-    filter(result == "OwnGoal")
+    dplyr::filter(result == "OwnGoal")
   dat1 <- rbind(dat1, d1)
   dat2 <- data2 %>%
-    filter(result == "Goal")
+    dplyr::filter(result == "Goal")
   d2 <- data2 %>%
-    filter(result == "OwnGoal")
+    dplyr::filter(result == "OwnGoal")
   dat2 <- rbind(dat2, d2)
 
   team1 <- data$home_team
@@ -127,15 +134,18 @@ plot_timeline <- function(data, match_year, team_home, team_away, home_color, aw
     gls2 <- "Goals"
   }
 
-  plot_title <- glue("<b style='color:{home_color}'> {team1} : {g1} {gls1} ({xG1} xG) </b> vs. <b style='color:{away_color}'> {team2} : {g2} {gls2} ({xG2} xG)</b>")
+  # plot_title <- glue("<b style='color:{home_color}'> {team1} : {g1} {gls1} ({xG1} xG) </b> vs. <b style='color:{away_color}'> {team2} : {g2} {gls2} ({xG2} xG)</b>")
+  plot_title <- sprintf("<b style='color:%s'> %s : %s %s (%s xG) </b> vs. <b style='color:%s'> %s : %s %s (%s xG)</b>",
+                        home_color, team1, g1, gls1, xG1, 
+                        away_color, team2, g2, gls2, xG2)
 
   min1 <- dat1$minute
   min2 <- dat2$minute
   p1 <- dat1$player
   p2 <- dat2$player
 
-  player_lab1 <- glue("{p1} : {min1}")
-  player_lab2 <- glue("{p2} : {min2}")
+  player_lab1 <- paste0(p1, " : ", min1)
+  player_lab2 <- paste0(p2, " : ", min2)
 
   plot_timeline <- ggplot() +
     geom_step(data = data1, aes(x = minute, y = xGsum), colour = home_color, size = 3) +

R/plot_trendline.R

@@ -19,7 +19,6 @@
 #' @param theme to select the theme from 4 options -> dark, almond, rose, white.
 #'
 #' @import dplyr
-#' @importFrom glue glue
 #' @import ggplot2
 #' @import ggtext
 #' @import Rcpp
@@ -123,7 +122,9 @@ plot_trendline <- function(data, team, colour_xg, colour_xga, roll_avg, theme =
   }
 
   team <- paste(team, "xG Trendline")
-  subtitle <- glue("{roll_avg} Game Rolling Average [<b style='color:{colour_xg}'> xG </b> vs <b style='color:{colour_xga}'> xGA </b>]")
+  # subtitle <- glue("{roll_avg} Game Rolling Average [<b style='color:{colour_xg}'> xG </b> vs <b style='color:{colour_xga}'> xGA </b>]")
+  subtitle <- sprintf("%s Game Rolling Average [<b style='color:%s'> xG </b> vs <b style='color:%s'> xGA </b>]",
+                      roll_avg, colour_xg, colour_xga)
 
   ggplot(data, aes(x = Date)) +
     geom_line(aes(y = xGSM), colour = colour_xg, size = 3) +