Edits to README

jmh579 · Sep 26, 2017 · 23e7f4d · 23e7f4d
1 parent fb11104
commit 23e7f4d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 51 deletions.
diff --git a/README.Rmd b/README.Rmd
@@ -1,9 +1,12 @@
 ---
 output: github_document
 ---
+[![Build status](https://ci.appveyor.com/api/projects/status/7qsrpldj8g3m3lu3?svg=true)](https://ci.appveyor.com/project/cipriuhq/brapi)
+[![Build Status](https://travis-ci.org/c5sire/brapi.svg?branch=master)](https://travis-ci.org/CIP-RIU/brapi)
+[![Coverage Status](https://coveralls.io/repos/github/c5sire/brapi/badge.svg)](https://coveralls.io/github/CIP-RIU/brapi)
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-# The official repository for the Breeding API (BraPi)implemenation in R 
+# The official repository for the Breeding API (BrAPI) implemenation in R 
 
 ## This version is still under development. The implementation sometimes changes minor details.
 
@@ -33,7 +36,7 @@ See [tutorial](https://github.com/c5sire/brapi/blob/master/inst/doc/tutorial.Rmd
 
 ## Documentation of JSON response/requests
 
-<<<<<<< HEAD
+
 Follow the links in the table below or see the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
 =======
 See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
@@ -44,47 +47,3 @@ See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire
 See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
 
 
->>>>>>> upstream/master
-
-```{r, echo=FALSE}
-# calls_data = tryCatch({
-#   read.csv(system.file("apidocs/calls.csv", package = "brapi"),
-#            stringsAsFactors = FALSE)
-#   
-# }, error = function(e) {
-#   NULL
-# }
-# )
-# 
-# 
-# 
-# res <- calls_data[stringr::str_detect(calls_data$client.brapi, "x"), c(1, 7, 8)]
-# 
-# pct <- round(nrow(res) / nrow(calls_data) * 100, 1)
-```
-
-```{r, echo=FALSE}
-
-
-#res[, 3] <- paste0("[", res[, 3], "](https://github.com/CIP-RIU/brapi/blob/master/inst/apidocs/", res[, 3], ".md)") 
-
-#res[, 2] <- paste0("[", res[, 2], "](https://github.com/plantbreeding/API/blob/master/Specification/", res[, 1], "/", 
-#                   res[, 2], ".md)") 
-#res[, 1] <- paste0("[", res[, 1], "](https://github.com/plantbreeding/API/blob/master/Specification/", res[, 1], ")") 
-
-#knitr::kable(res, row.names = FALSE)
-
-```
-
-```{r eval=FALSE, echo=FALSE}
-#rp =covr::package_coverage()
-
-#covr::report(rp)
-
-###########################
-owd <- getwd()
-setwd("inst/apidocs")
-mdfiles <- list.files(".", "*.Rmd")
-sapply(mdfiles, knitr::knit)
-setwd(owd)
-```
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
 
+[![Build status](https://ci.appveyor.com/api/projects/status/7qsrpldj8g3m3lu3?svg=true)](https://ci.appveyor.com/project/cipriuhq/brapi) [![Build Status](https://travis-ci.org/c5sire/brapi.svg?branch=master)](https://travis-ci.org/CIP-RIU/brapi) [![Coverage Status](https://coveralls.io/repos/github/c5sire/brapi/badge.svg)](https://coveralls.io/github/CIP-RIU/brapi)
+
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-The official repository for the Breeding API (BraPi)implemenation in R
-======================================================================
+The official repository for the Breeding API (BrAPI) implemenation in R
+=======================================================================
 
 This version is still under development. The implementation sometimes changes minor details.
 --------------------------------------------------------------------------------------------
@@ -26,11 +28,12 @@ See [tutorial](https://github.com/c5sire/brapi/blob/master/inst/doc/tutorial.Rmd
 Documentation of JSON response/requests
 ---------------------------------------
 
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD Follow the links in the table below or see the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md) ======= See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
+Follow the links in the table below or see the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
+=================================================================================================================================================================
+
+See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
 
 \#\# Implementation status
 ==========================
 
 See the inst/apidocs directory for examples: [apidocs](https://github.com/c5sire/brapi/blob/master/inst/apidocs/README.md)
-
-> > > > > > > upstream/master