Merge branch 'Div44-master'

.gitignore

@@ -1,4 +1,3 @@
-*.txt
 *.sqlite
 gmon.out
 __pycache__

CHANGELOG.txt → CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 2.9.4
+================
+- new time formatting in hh:mm:ss format (by Divyanshu Sharma, https://github.com/Div44)
+- permissive new BSD license
+
+
 VERSION 2.9.3
 ================
 - some PEP8 adjustments and code cleanup
@@ -7,25 +13,20 @@ VERSION 2.9.3
 
 VERSION 2.9.2
 ================
-
 - support for psutil >= 2.0 and < 2.0.
 - removed psutil from the setup requirements and made it's installation 
   optional via "pip install pyprind -r requirements.txt"
 
 
 VERSION 2.9.1
 ================
-
 - Minor reorganization of the generator interface.
 - Minor changes to the code documentation.
 - Added new test files.
 
 
-
 VERSION 2.9.0
 ================
-
-
 - New generator functions for progress bar and percentage indicators via:
 
     for i in pyprind.prog_bar(range(n)):
@@ -39,10 +40,8 @@ VERSION 2.9.0
 (by Olaf Gladis, https://github.com/hwmrocker)
 
 
-
 VERSION 2.8.0
 ================
-
 - A new `.stop()` method to stop the progress bar / percentage indicator early.
 - `.update()` method accepts an `item_id` argument now in order to display
   which item is currently processed next to the progress bar / percentage indicator.
@@ -54,53 +53,45 @@ VERSION 2.8.0
 
 VERSION 2.7.0
 ================
-
 - Version intentionally skipped to not cause confusion that
   this is a tool exclusively for Python 2.7.
 
 
 VERSION 2.6.2
 ================
-
 - Fixed bug that the report was squeezed after the bar and before the "time elapsed" string if printed immediately after the progress bar has reached 100%.
 
 
 VERSION 2.6.1
 ================
-
 - Small bugfix on some system a warning was printed although
   a valid output string was provided.
 
 
 VERSION 2.6.0
 ================
-
 - Added IPython Notebook support
 - Fixed to work with most recent psutil v. 0.6 for monitoring CPU and memory usage
 
 
 VERSION 2.5.0
 ================
-
 - New default argument `monitor=False` was added to `ProgBar()` and `ProgPercent()` objects to monitor memory and CPU usage (via `psutil`) if `monitor` is set to True.
 
 
 VERSION 2.4.0
 ================
-
 - Default argument for `.update(iterations=1)` methods to increment the count by more than 1 per
   iteration.
 
 
 VERSION 2.3.1
 ================
-
 - Minor fix of the output formatting.
 
 
 VERSION 2.3.0
 ================
-
 - Added native print() support
   prints title and elapsed time of an tracked object after loop completed.
 - Data member self.end stores elapsed time when loop completed.
@@ -109,7 +100,6 @@ VERSION 2.3.0
 
 VERSION 2.2.0
 ================
-
 - added ETA (estimated time until arrival) tracking to progress bar  
   (by Taylan Aydinli).
 - better support for Python 2.x.
@@ -118,26 +108,22 @@ VERSION 2.2.0
 
 VERSION 2.1.1
 ================
-
 - Changed visuals of the printed progress for percentage indicators.
 
 
 VERSION 2.1.0
 ================
-
 - added ETA (estimated time until arrival) tracking to percentage indicator  
   (by Taylan Aydinli, https://github.com/taylan)
 
 
 VERSION 2.0.3
 ================
-
 - Accepts a given outputstream for the `stream` parameter. 
 
 
 VERSION 2.0.2
 ================
-
 - Fixed bug that occurred for some Python 3.3.3 users
 specifically on Linux Red Hat 4.4.7-1, GCC v. 4.4.7
 that self.max_iter was cast to a float when `ProgBar()`
@@ -158,16 +144,15 @@ VERSION 2.0.0
     my_prbar = pyprind.ProgBar(n, stream=1) # writes to stdout
     my_prbar = pyprind.ProgBar(n, stream=2) # writes to stderr, default
 
-
 - Does not redirect data to the standard output or error stream if program is not
   outputting to a terminal.
 
-
 
 VERSION 1.1.1
 ==============
 - Fixed problem with packaging of example scripts.
 
+
 VERSION 1.1.0
 ===============
 - Added live time tracking to percentage indicator
@@ -197,7 +182,6 @@ VERSION 1.0.2
 
 VERSION 1.0.1
 ===============
-
 - Added more README formats.
 - Added class descriptions.
 - Added example scripts to the distribution.

LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2014-2016, Sebastian Raschka
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of biopandas nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+