Merge pull request #20 from bmcfee/release-021

Release 0.1.2
pescadores · Feb 23, 2016 · cc73f33 · cc73f33
2 parents 39c3c62 + 5c11ef3
commit cc73f33
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2015, Pescador developers
+Copyright (c) 2016, Pescador developers
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,14 @@
 Changes
 =======
 
+v0.1.2
+------
+
+- Added ``pescador.mux`` parameter `revive`.  Calling with `with_replacement=False, revive=True`
+  will use each seed at most once at any given time.
+- Added ``pescador.zmq_stream`` parameter `timeout`. Setting this to a positive number will terminate
+  dangling worker threads after `timeout` is exceeded on join.  See also: ``multiprocessing.Process.join``.
+
 v0.1.1
 ------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,7 +55,7 @@
 
 # General information about the project.
 project = u'pescador'
-copyright = u'2015, Brian McFee and Eric Humphrey'
+copyright = u'2016, Brian McFee and Eric Humphrey'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/pescador/version.py b/pescador/version.py
@@ -3,4 +3,4 @@
 """Version info"""
 
 short_version = '0.1'
-version = '0.1.1'
+version = '0.1.2'