summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-17 16:18:00 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-17 16:18:00 +0100
commit0291759a750ebc46882d7ee9c75e21661ac5c024 (patch)
tree45908de4b4441f37f1aad7e6fedb6481f2aa262e
parente0df048ac1bf55ec18d03f68c0adc0bac756e136 (diff)
downloadpsutil-0291759a750ebc46882d7ee9c75e21661ac5c024.tar.gz
update dates
-rw-r--r--HISTORY.rst2
-rw-r--r--README.rst3
-rw-r--r--psutil/tests/test_process.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 12a8732a..e3c54cff 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,6 @@
Bug tracker at https://github.com/giampaolo/psutil/issues
-4.0.0 - XXXX-XX-XX
+4.0.0 - 2016-02-17
==================
**Enhancements**
diff --git a/README.rst b/README.rst
index 017a0d66..eb0da7a3 100644
--- a/README.rst
+++ b/README.rst
@@ -143,7 +143,7 @@ Disks
sdiskusage(total=21378641920, used=4809781248, free=15482871808, percent=22.5)
>>>
>>> psutil.disk_io_counters(perdisk=False)
- sdiskio(read_count=719566, write_count=1082197, read_bytes=18626220032, write_bytes=24081764352, read_time=5023392, write_time=63199568)
+ sdiskio(read_count=719566, write_count=1082197, read_bytes=18626220032, write_bytes=24081764352, read_time=5023392, write_time=63199568, read_merged_count=619166, write_merged_count=812396, busy_time=4523412)
>>>
Network
@@ -353,6 +353,7 @@ http://groups.google.com/group/psutil/
Timeline
========
+- 2016-02-17: `psutil-4.0.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-4.0.0.tar.gz>`_
- 2016-01-20: `psutil-3.4.2.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.4.2.tar.gz>`_
- 2016-01-15: `psutil-3.4.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.4.1.tar.gz>`_
- 2015-11-25: `psutil-3.3.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.3.0.tar.gz>`_
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index 225e1f09..42ad59ea 100644
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -546,7 +546,7 @@ class TestProcess(unittest.TestCase):
if thread._running:
thread.stop()
- @retry_before_failing
+ @retry_before_failing()
def test_threads_2(self):
p = psutil.Process()
if OPENBSD: