v 2.9.2

rasbt · May 8, 2015 · 2773503 · 2773503
1 parent dc6da61
commit 2773503
Show file tree

Hide file tree

Showing 59 changed files with 86 additions and 825 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,10 +1,16 @@
+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.
 
 

diff --git a/MANIFEST b/MANIFEST
@@ -12,7 +12,7 @@ examples/ex2_progressbar_allargs.py
 examples/ex3_percentage_indicator_monitor.py
 examples/ex3_progress_bar_monitor.py
 pyprind/__init__.py
+pyprind/generator_factory.py
 pyprind/prog_class.py
 pyprind/progbar.py
 pyprind/progpercent.py
-test/test_small_progbar.py
diff --git a/README.html b/README.html
@@ -306,6 +306,11 @@
 
 </head>
 <body>
+<p><a href="http://badge.fury.io/py/pyprind"><img src="https://badge.fury.io/py/pyprind.svg" alt="PyPI version" /></a>
+<img src="https://img.shields.io/badge/python-2.7-blue.svg" alt="Python 2.7" />
+<img src="https://img.shields.io/badge/python-3.4-blue.svg" alt="Python 3.4" />
+<img src="https://img.shields.io/badge/license-GPLv3-blue.svg" alt="Python 3.4" /></p>
+
 <h1>PyPrind (Python Progress Indicator)</h1>
 
 <p>The <code>PyPrind</code> (Python Progress Indicator) module provides a <strong>progress bar</strong> and a <strong>percentage indicator</strong> object that let you track the progress of a loop structure or other iterative computation.<br/>
@@ -314,8 +319,17 @@ <h1>PyPrind (Python Progress Indicator)</h1>
 
 <p><br></p>
 
+<h4>Progress Bars and Percentage Indicators</h4>
+
 <p><img src="https://raw.githubusercontent.com/rasbt/pyprind/master/images/overview_1.png" alt="Screenshot of PyPrind executed in an IPython notebook" /></p>
 
+<p><br>
+<br></p>
+
+<p><a id='advanced_tracking'></p>
+
+<h4>Advanced Tracking</h4>
+
 <p><img src="https://raw.githubusercontent.com/rasbt/pyprind/master/images/overview_2.png" alt="Screenshot of PyPrind executed in an IPython notebook" /></p>
 
 <h3><a href="http://nbviewer.ipython.org/github/rasbt/pyprind/blob/master/examples/pyprind_demo.ipynb">View more examples in an IPython Demo Notebook</a></h3>
@@ -336,6 +350,32 @@ <h1>Sections</h1>
 </ul>
 
 
+<p><a id="installation"></a></p>
+
+
+<p><br>
+<br>
+<br></p>
+
+<h1>Installation</h1>
+
+<p>[<a href="#sections">back to top</a>]</p>
+
+<p>The most convenient way to install PyPrind is via tools like <code>pip</code> or <code>easy_install</code>:</p>
+
+<ul>
+<li><p><code>pip install pyprind</code></p></li>
+<li><p><code>easy_install pyprind</code></p></li>
+</ul>
+
+
+<p>PyPrind comes without any dependencies except for the optional <a href="https://pypi.python.org/pypi/psutil">psutil</a> to <a href="#advanced_tracking">monitor CPU and memory usages</a>. You can install <code>psutil</code> via <code>pip install pyprind</code> or install it automatically with PyPrind:<br/>
+ <code>pip install pyprind -r requirements.txt</code></p>
+
+<p>Alternatively, you can install PyPrind the classic way: Download the package from the Python Package Index <a href="https://pypi.python.org/pypi/PyPrind">https://pypi.python.org/pypi/PyPrind</a>, unzip it, navigate into the unzipped directory, and use the command</p>
+
+<p><code>python setup.py install</code></p>
+
 <p><a id="documentation"></a></p>
 
 

diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+[![PyPI version](https://badge.fury.io/py/pyprind.svg)](http://badge.fury.io/py/pyprind)
+![Python 2.7](https://img.shields.io/badge/python-2.7-blue.svg)
+![Python 3.4](https://img.shields.io/badge/python-3.4-blue.svg)
+![Python 3.4](https://img.shields.io/badge/license-GPLv3-blue.svg)
+
 # PyPrind (Python Progress Indicator)
 
 
@@ -18,6 +23,8 @@ at runtime about the progress of the computation.
 <br>
 <br>
 
+<a id='advanced_tracking'>
+
 #### Advanced Tracking
 
 ![Screenshot of PyPrind executed in an IPython notebook](https://raw.githubusercontent.com/rasbt/pyprind/master/images/overview_2.png)
@@ -43,6 +50,33 @@ at runtime about the progress of the computation.
 - [Changelog](https://raw.githubusercontent.com/rasbt/pyprind/master/CHANGELOG.txt)
 
 
+<p><a id="installation"></a></p>
+<br>
+<br>
+<br>
+
+# Installation
+[[back to top](#sections)]
+
+The most convenient way to install PyPrind is via tools like `pip` or `easy_install`:
+
+- `pip install pyprind`  
+
+-  `easy_install pyprind`  
+
+
+
+PyPrind comes without any dependencies except for the optional [psutil](https://pypi.python.org/pypi/psutil) to [monitor CPU and memory usages](#advanced_tracking). You can install `psutil` via `pip install pyprind` or install it automatically with PyPrind:  
+ `pip install pyprind -r requirements.txt` 
+
+
+
+Alternatively, you can install PyPrind the classic way: Download the package from the Python Package Index [https://pypi.python.org/pypi/PyPrind](https://pypi.python.org/pypi/PyPrind), unzip it, navigate into the unzipped directory, and use the command
+
+`python setup.py install`  
+
+
+
 
 <p><a id="documentation"></a></p>
 <br>

diff --git a/benchmarks/benchmark_data_v1.0.0/README.md b/benchmarks/benchmark_data_v1.0.0/README.md
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite.py b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite.py
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite_percentind.py b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite_percentind.py
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite_progbar.py b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/code/init_sqlite_progbar.py
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_code.png b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_code.png
diff --git a/...s/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_percentind_code.png b/...s/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_percentind_code.png
diff --git a/...arks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_progbar_code.png b/...arks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_progbar_code.png
diff --git a/...marks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_spreadsheet.png b/...marks/benchmark_data_v1.0.0/init_sqlite_test/images/init_sqlite_spreadsheet.png
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/list_id.txt.png b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/list_id.txt.png
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/my_sqlite_db.png b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/images/my_sqlite_db.png
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/barplot_init_sqlite.py b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/barplot_init_sqlite.py
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/barplot_nit_sqlite.png b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/barplot_nit_sqlite.png
diff --git a/...arks/benchmark_data_v1.0.0/init_sqlite_test/plots/init_sqlite_lines_per_sec.png b/...arks/benchmark_data_v1.0.0/init_sqlite_test/plots/init_sqlite_lines_per_sec.png
diff --git a/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/init_sqlite_lines_per_sec.py b/benchmarks/benchmark_data_v1.0.0/init_sqlite_test/plots/init_sqlite_lines_per_sec.py