Fix vignette problem

CorrelAid · Jun 29, 2019 · 020a41e · 020a41e
1 parent d2be771
commit 020a41e
Show file tree

Hide file tree

Showing 24 changed files with 257 additions and 6 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -9,4 +9,4 @@
 ^README-.*\.png$
 ^cran-comments\.md$
 ^newsanchor\.png$
-^vignettes\/scrape-nyt_cache\/*$
+^examples$
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2019-03-05.
+Once it is accepted, delete this file and tag the release (commit 9879502857).
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,8 +20,6 @@ Imports:
     xml2,
     lubridate,
     askpass
-Remotes: 
-    jeroen/askpass
 Suggests: 
     dplyr,
     knitr,

diff --git a/NEWS.md b/NEWS.md
@@ -5,3 +5,4 @@
 # version 0.1.1 (2019-06-25)
 
 - fixed issue with the NYT vignette (now suggests package "textdata")
+- moved vignette to 'example' folder in root directory
diff --git a/cran-comments.md b/cran-comments.md
@@ -11,4 +11,6 @@ There are currently no downstream dependencies for this package.
 
 ## Fixed: Version  0.1.1
 Version 0.1.1 contains a fix for one of the vignettes which had seen a change
-in package dependencies. DESCRIPTION now suggests to load textdata as well.
+in package dependencies. DESCRIPTION now suggests to load textdata as well
+and vignette (which needs to be run interactively) is now in an examples 
+folder which is included in .Rbuildignore.
diff --git a/vignettes/scrape-nyt.R → examples/scrape-nyt.R b/vignettes/scrape-nyt.R → examples/scrape-nyt.R
diff --git a/vignettes/scrape-nyt.Rmd → examples/scrape-nyt.Rmd b/vignettes/scrape-nyt.Rmd → examples/scrape-nyt.Rmd
diff --git a/vignettes/scrape-nyt.html → examples/scrape-nyt.html b/vignettes/scrape-nyt.html → examples/scrape-nyt.html
diff --git a/examples/scrape-nyt_cache/html/__packages b/examples/scrape-nyt_cache/html/__packages
@@ -0,0 +1,10 @@
+base
+newsanchor
+robotstxt
+httr
+xml2
+rvest
+dplyr
+stringr
+tidytext
+textdata
diff --git a/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.RData b/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.RData
diff --git a/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.rdb b/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.rdb
diff --git a/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.rdx b/examples/scrape-nyt_cache/html/apply function to urls_f3e95a4c99074f1e7733b304b11b4031.rdx
diff --git a/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.RData b/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.RData
diff --git a/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.rdb b/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.rdb
diff --git a/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.rdx b/examples/scrape-nyt_cache/html/calculate sentiment_df37f4437bc03f7f3bf9fc9b20b2e1c1.rdx
diff --git a/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.RData b/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.RData
diff --git a/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.rdb b/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.rdb
diff --git a/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.rdx b/examples/scrape-nyt_cache/html/check robots txt_68bb1d885acdcc65ea194d1e8fc39faf.rdx
diff --git a/...ples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.RData b/...ples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.RData
diff --git a/examples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.rdb b/examples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.rdb
diff --git a/examples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.rdx b/examples/scrape-nyt_cache/html/define parsing function_f2eff27ec1474667ed825f8318a12465.rdx
diff --git a/examples/scrape-nyt_files/figure-html/plot-results-1.svg b/examples/scrape-nyt_files/figure-html/plot-results-1.svg
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,5 +1,4 @@
 library(testthat)
 library(newsanchor)
 library(askpass)
-library(mockery)
 test_check("newsanchor")
diff --git a/tests/testthat/test_get_everything.R b/tests/testthat/test_get_everything.R
@@ -86,7 +86,7 @@ testthat::test_that("Test that function stops when invalid date format is provid
 # INVALID API KEY --------------------------------------------------------------------
 testthat::test_that("test that function raises warning if API key invalid.", {
   testthat::expect_warning(newsanchor::get_everything(api_key = "thisisnotanapikey",
-                                                      query = "sports"),
+                                                     query = "sports"),
                            regexp = "The search resulted in the following error message:")
 })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This package was submitted to CRAN on 2019-03-05.
		Once it is accepted, delete this file and tag the release (commit 9879502857).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		# version 0.1.1 (2019-06-25)

		- fixed issue with the NYT vignette (now suggests package "textdata")
		- moved vignette to 'example' folder in root directory