Skip to content

Commit

Permalink
Merge pull request #11 from snoweye/master
Browse files Browse the repository at this point in the history
0.2-6 starts
  • Loading branch information
snoweye authored Jan 4, 2017
2 parents e3b77eb + 7f38f78 commit 67cf4c0
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ after_failure:

notifications:
email:
on_success: change
on_failure: change
on_success: no
on_failure: no

sudo: required
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2016-12-31: Ver 0.2-6
* Move pbdRPC and remoters to Suggests.

2016-12-17: Ver 0.2-5
* Change web address.

Expand Down
9 changes: 5 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: pbdZMQ
Version: 0.2-5
Date: 2016-12-17
Version: 0.2-6
Date: 2017-01-03
Title: Programming with Big Data -- Interface to ZeroMQ
Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email =
"[email protected]"),
Expand All @@ -14,9 +14,10 @@ Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email =
person("R Core team", role = "ctb", comment = "some functions are
modified from the R source code"),
person("Philipp", "A.", role = "ctb", comment = "Fedora"))
Depends: R (>= 3.0.0)
Depends: R (>= 3.2.0)
Imports: R6
Enhances: pbdRPC, remoter
Suggests: pbdRPC, remoter
Enhances: pbdMPI, pbdCS
LazyLoad: yes
LazyData: yes
Copyright: See files AUTHORS, COPYING, COPYING.LESSER, and MAINTAINERS
Expand Down
6 changes: 2 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Read pbdZMQ vignettes first at
### http://cran.r-project.org/web/packages/pbdZMQ/vignettes/pbdZMQ-guide.pdf
### Read pbdZMQ vignettes "pbdZMQ-guide.pdf" first at
### "https://cran.r-project.org/package=pbdZMQ".
###
### pbdZMQ can be installed with/without external ZeroMQ 4.1.0 rc 1 library
### since pbdZMQ includes a minimum requirement of ZeroMQ 4.1.0 rc 1 library.
Expand All @@ -9,8 +9,6 @@
###
### Solaris needs ZeroMQ 4.0.7 library with GNU Make 4.1 (OpenCSW).
### See Section for Solaris in next for installation steps and read pbdZMQ
### pbdZMQ vignettes for further considerations at
### http://cran.r-project.org/web/packages/pbdZMQ/vignettes/pbdZMQ-guide.pdf

--- 'pbdZMQ' installation:
0. 'pkg-config' and system ZeroMQ library (libzmq, libzmq-dev) are requrired.
Expand Down
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ The package contains 3 separate interfaces:
3. One modeled after the rzmq interface (see help("rzmq"))



## Client/Server Example

The primary focus of pbdZMQ is for building client/server interfaces
Expand Down Expand Up @@ -76,7 +75,6 @@ For an example of how to do this more persistently, see the pbdZMQ
package vignette.



## Installation

pbdZMQ requires
Expand All @@ -99,6 +97,19 @@ install_github("RBigData/pbdZMQ")
```


## Citation

When mentioning the pbdZMQ, please cite:

```
@MISC{pbdZMQ2015,
author = {Chen, W.-C. and Schmidt, D. and Ostrouchov, G.},
title = {pbdZMQ: Programming with Big Data -- Interface to ZeroMQ},
year = {2015},
note = {R Package, URL https://cran.r-project.org/package=pbdZMQ}
}
```


## Authors

Expand Down
6 changes: 2 additions & 4 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ citEntry(
as.person("Christian Heckendorf"),
as.person("George Ostrouchov")),
year = "2015",
note = "{R} Package",
url = "https://cran.r-project.org/package=pbdZMQ",
note = "{R} Package, URL https://cran.r-project.org/package=pbdZMQ",
textVersion = "Chen, W.-C., Schmidt, D., Heckendorf, C., and Ostrouchov, G. (2015) pbdZMQ: Programming with Big Data -- Interface to ZeroMQ. R Package, URL https://cran.r-project.org/package=pbdZMQ",
key = "Chen2015pbdZMQpackage"
)
Expand All @@ -20,8 +19,7 @@ citEntry(
author = personList(as.person("Wei-Chen Chen"),
as.person("Drew Schmidt")),
year = "2015",
note = "{R} Vignette",
url = "https://cran.r-project.org/package=pbdZMQ",
note = "{R} Vignette, URL https://cran.r-project.org/package=pbdZMQ",
textVersion = "Chen, W.-C. and Schmidt, D. (2015) A Quick Guide for the pbdZMQ Package. R Vignette, URL https://cran.r-project.org/package=pbdZMQ",
key = "Chen2015pbdZMQvignette"
)
Expand Down
Binary file modified inst/doc/pbdZMQ-guide.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions vignettes/pbdZMQ-include/pbdZMQ.bib
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ @MISC{Chen2012
title = {pbdMPI: Programming with Big Data -- Interface to MPI},
year = {2012},
note = {R Package},
url = {http://cran.r-project.org/package=pbdMPI}
url = {https://cran.r-project.org/package=pbdMPI}
}

@MISC{Chen2015,
author = {Chen, W.-C. and Schmidt, D. and Ostrouchov, G.},
title = {pbdZMQ: Programming with Big Data -- Interface to ZeroMQ},
year = {2015},
note = {R Package},
url = {http://cran.r-project.org/package=pbdZMQ}
url = {https://cran.r-project.org/package=pbdZMQ}
}

@MISC{pbdR2012,
Expand Down Expand Up @@ -44,7 +44,7 @@ @MISC{Armstrong2014
title = {rzmq: R Bindings for ZeroMQ},
year = {2014},
note = {R Package},
url = {http://cran.r-project.org/package=rzmq}
url = {https://cran.r-project.org/package=rzmq}
}

@misc{hintjens2013zeromq,
Expand Down

0 comments on commit 67cf4c0

Please sign in to comment.