aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS.rst3
-rw-r--r--CHANGES.rst8
-rw-r--r--doc/Makefile2
-rw-r--r--doc/conf.py2
-rw-r--r--doc/index.rst2
-rw-r--r--pushover.py4
-rw-r--r--setup.py2
7 files changed, 16 insertions, 7 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 704cb48..d01144f 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -3,5 +3,8 @@ Contributors
* Sam Birch <sam.m.birch@gmail.com>
* Crupuk
+* chevell
+* drachenminister
* Thibaut Horel <thibaut.horel@gmail.com>
* Filip Lundborg <filip@filipl.se>
+* Philip Lundrigan <philipbl@cs.utah.edu>
diff --git a/CHANGES.rst b/CHANGES.rst
index 9903ab3..7c84e22 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,13 @@
Changes
-------
-0.x
-~~~
+0.3 (2016-12-29)
+~~~~~~~~~~~~~~~~
+* Add support for the Glances API
+* Add a ``cancel`` function to ``MessageRequest`` objects to cancel high
+ priority messages
+* Add support for html message styling
* Fix bug in MessageRequest.poll for ``priority=2`` requests
0.2 (2014-08-16)
diff --git a/doc/Makefile b/doc/Makefile
index 4c92e6c..59e1de8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build2
+SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = build
diff --git a/doc/conf.py b/doc/conf.py
index fc1c903..ed74c97 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,7 +40,7 @@ master_doc = 'index'
# General information about the project.
project = u'python-pushover'
-copyright = u'2013'
+copyright = u'2013-2016'
# 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/doc/index.rst b/doc/index.rst
index 012cccc..0842869 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -10,3 +10,5 @@ API
.. automodule:: pushover
:members:
:show-inheritance:
+
+.. include:: ../CHANGES.rst
diff --git a/pushover.py b/pushover.py
index eeabbba..c51664d 100644
--- a/pushover.py
+++ b/pushover.py
@@ -330,7 +330,7 @@ For more details and bug reports, see: https://github.com/Thibauth/python-pushov
parser.add_argument("--user-key", "-u", help="Pushover user key")
parser.add_argument("message", help="message to send")
parser.add_argument("--title", "-t", help="message title")
- parser.add_argument("--priority", "-p", help="message priority")
+ parser.add_argument("--priority", "-p", help="message priority (-1, 0, 1 or 2)")
parser.add_argument("--url", help="additional url")
parser.add_argument("--url-title", help="additional url title")
parser.add_argument("-c", "--config", help="configuration file\
@@ -342,7 +342,7 @@ For more details and bug reports, see: https://github.com/Thibauth/python-pushov
help="output version information and exit",
version="""
%(prog)s 0.2
-Copyright (C) 2013-2014 Thibaut Horel <thibaut.horel@gmail.com>
+Copyright (C) 2013-2016 Thibaut Horel <thibaut.horel@gmail.com>
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.""")
diff --git a/setup.py b/setup.py
index c0d0338..6481bbd 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup
setup(name='python-pushover',
- version='0.2',
+ version='0.3',
description="Comprehensive bindings and command line utility for the "
"Pushover notification service",
long_description=open("README.rst").read() + "\n"