Bump to version 0.7.0

outini · Aug 24, 2017 · 4c65dab · 4c65dab
1 parent 625ab0e
commit 4c65dab
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 14 deletions.
diff --git a/CHANGES b/CHANGES
@@ -4,7 +4,10 @@ pymailq - Simple mail queue management
 Contact: Denis Pompilio (jawa) <[email protected]>
 https://github.com/outini/pymailq
 
-== v0.6.0 16/08/2017 ===
+=== v0.7.0 24/08/2017 ===
+    * Support of configuration file
+
+=== v0.6.0 16/08/2017 ===
     * Pqshell now have usage and options
     * Pqshell can now show pymailq package version
     * Pqshell can now be started in debug mode
@@ -15,7 +18,7 @@ https://github.com/outini/pymailq
     * Unit testing for python2.7 and python3
     * Using code coverage
 
-== v0.5.3 19/10/2014 ===
+=== v0.5.3 19/10/2014 ===
     * Complete support for python2.7 and python3
     * Project renamed to PyMailq
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0
+0.7.0
diff --git a/docs/pqshell.rst b/docs/pqshell.rst
@@ -11,7 +11,9 @@ means to view the queue content, filter mails on criterias like `Sender` or
 SYNOPSIS
 ********
 
-    pqshell [options]
+::
+
+    pqshell [-h] [--version] [--debug] [--config CFG_FILE]
 
 FEATURES
 ********
@@ -24,7 +26,10 @@ FEATURES
 OPTIONS
 *******
 
-No options supported.
+    -h, --help           show help message and exit
+    --version            show shell version
+    --debug              show shell debug and timing info
+    --config CFG_FILE    specify a configuration file for PyMailq
 
 SHELL COMMANDS
 **************

diff --git a/man/pqshell.1 b/man/pqshell.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PQSHELL" "1" "Aug 16, 2017" "0.6" "PyMailq"
+.TH "PQSHELL" "1" "Aug 24, 2017" "0.7" "PyMailq"
 .SH NAME
 pqshell \- A shell-like to interact with a Postfix mails queue
 .
@@ -38,7 +38,12 @@ means to view the queue content, filter mails on criterias like \fISender\fP or
 .SH SYNOPSIS
 .INDENT 0.0
 .INDENT 3.5
-pqshell [options]
+.sp
+.nf
+.ft C
+pqshell [\-h] [\-\-version] [\-\-debug] [\-\-config CFG_FILE]
+.ft P
+.fi
 .UNINDENT
 .UNINDENT
 .SH FEATURES
@@ -53,8 +58,24 @@ Administrative operations on mails queue
 History and autocomplete via readline, if installed.
 .UNINDENT
 .SH OPTIONS
-.sp
-No options supported.
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.TP
+.B \-h\fP,\fB  \-\-help
+show help message and exit
+.TP
+.B \-\-version
+show shell version
+.TP
+.B \-\-debug
+show shell debug and timing info
+.TP
+.BI \-\-config \ CFG_FILE
+specify a configuration file for PyMailq
+.UNINDENT
+.UNINDENT
+.UNINDENT
 .SH SHELL COMMANDS
 .sp
 An inside help is available with the help command. Each provided command takes

diff --git a/packaging/pymailq.spec b/packaging/pymailq.spec
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 24 2017 Denis Pompilio <[email protected]> - 0.7.0-1
+- Support of configuration file
 * Thu Aug 24 2017 Denis Pompilio <[email protected]> - 0.6.0-2
 - Added CHANGES file and examples to package
 * Wed Aug 16 2017 Denis Pompilio <[email protected]> - 0.6.0-1

diff --git a/pymailq/__init__.py b/pymailq/__init__.py
@@ -32,7 +32,7 @@
 DEBUG = False
 
 #: Current version of the package as :class:`str`.
-VERSION = "0.6.0"
+VERSION = "0.7.0"
 
 #: Module configuration as :class:`dict`.
 CONFIG = {

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 if __name__ == '__main__':
     readme_file = os.path.join(os.path.dirname(__file__), 'README.rst')
-    release = "0.6.0"
+    release = "0.7.0"
     setup(
         name="pymailq",
         version=release,

diff --git a/tests/test_mail_api.py b/tests/test_mail_api.py
@@ -189,23 +189,23 @@ def test_control_nothing_done():
 def test_control_hold():
     """Test QueueControl.hold_messages"""
     pymailq.CONFIG['commands']['use_sudo'] = True
-    result = QCONTROL.hold_messages(PSTORE.mails[0:2])
+    result = QCONTROL.hold_messages(PSTORE.mails[-2:])
     assert type(result) == list
     assert "postsuper: Placed on hold: 2 messages" in result
 
 
 def test_control_release():
     """Test QueueControl.release_messages"""
     pymailq.CONFIG['commands']['use_sudo'] = True
-    result = QCONTROL.release_messages(PSTORE.mails[0:2])
+    result = QCONTROL.release_messages(PSTORE.mails[-2:])
     assert type(result) == list
     assert "postsuper: Released from hold: 2 messages" in result
 
 
 def test_control_requeue():
     """Test QueueControl.requeue_messages"""
     pymailq.CONFIG['commands']['use_sudo'] = True
-    result = QCONTROL.requeue_messages(PSTORE.mails[0:2])
+    result = QCONTROL.requeue_messages(PSTORE.mails[-2:])
     assert "postsuper: Requeued: 2 messages" in result