summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-02-06 18:58:25 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2015-02-06 18:58:45 +0100
commit9e65e5bbd8d76a1429d2c6f88f30319db740b07e (patch)
tree91c4a7c350b4179416f104564314acf659d2674b
parent97a22c99612af3b81ff41fd210002e84d68eb272 (diff)
downloadpsutil-9e65e5bbd8d76a1429d2c6f88f30319db740b07e.tar.gz
(issue #581) add more stuff in .gitignore - bump up version to 3.0.0
-rw-r--r--.gitignore27
-rw-r--r--CREDITS3
-rw-r--r--HISTORY.rst8
-rw-r--r--psutil/__init__.py2
4 files changed, 30 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 2659d8f9..99d0d545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,18 @@
-syntax: glob
-build/
-*.pyc
-*.egg-info
-dist/
-*.pyd
-.idea/
-.cache/
-.tox/
+syntax: glob
+*.al
+*.bak
+*.egg-info
+*.la
+*.lo
+*.o
+*.orig
+*.pyc
+*.pyd
+*.rej
+*.so
+*.swp
+.cache/
+.idea/
+.tox/
+build/
+dist/
diff --git a/CREDITS b/CREDITS
index c3f630f9..fac83f68 100644
--- a/CREDITS
+++ b/CREDITS
@@ -280,3 +280,6 @@ I: 568
N: Bruno Binet
E: bruno.binet@gmail.com
I: 572
+
+N: Gabi Davar
+I: 581
diff --git a/HISTORY.rst b/HISTORY.rst
index b205c66d..4632cca5 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,13 @@
Bug tracker at https://github.com/giampaolo/psutil/issues
+3.0.0 - XXXX-XX-XX
+==================
+
+**Enhancements**
+
+- #581: add .gitignore. (patch by Gabi Davar)
+
+
2.2.1 - 2015-02-02
==================
diff --git a/psutil/__init__.py b/psutil/__init__.py
index 322cc214..0b572962 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -13,7 +13,7 @@ in Python.
from __future__ import division
__author__ = "Giampaolo Rodola'"
-__version__ = "2.2.1"
+__version__ = "3.0.0"
version_info = tuple([int(num) for num in __version__.split('.')])
__all__ = [