From 66875d5fb52b87ea57e1b2b431ad13a555e16b24 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sun, 13 Apr 2014 11:22:34 +0200
Subject: [PATCH] Require argvard >= 0.3.0

---
 setup.py          | 6 +++++-
 vdirsyncer/cli.py | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index d051478..5003fe4 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,10 @@ setup(
     entry_points={
         'console_scripts': ['vdirsyncer = vdirsyncer.cli:main']
     },
-    install_requires=['argvard', 'requests', 'lxml'],
+    install_requires=[
+        'argvard>=0.3.0',
+        'requests',
+        'lxml'
+    ],
     extras_require={'keyring': ['keyring']}
 )
diff --git a/vdirsyncer/cli.py b/vdirsyncer/cli.py
index c33b3fd..93b1a71 100644
--- a/vdirsyncer/cli.py
+++ b/vdirsyncer/cli.py
@@ -132,11 +132,6 @@ def _main(env, file_cfg):
     general, all_pairs, all_storages = file_cfg
     app = argvard.Argvard()
 
-    @app.main()
-    def app_main(context):
-        # https://github.com/DasIch/argvard/issues/2
-        app.options['--help'].function(context)
-
     @app.option('--verbosity verbosity')
     def verbose_option(context, verbosity):
         '''