From 98bb3f2cd3bf007041265583af95845264d7e189 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 6 May 2013 19:31:56 -0300
Subject: Adapt smtp-relay to use leap.common.keymanager

* Add docstrings to smtp-relay classes.
* Setup test suite.
    * Add setuptools-trial as dependency for tests.
    * Move smtp-relay tests to default test directory.
* Add tests for smtp-relay.
    * Send of unencrypted mail depending on 'encrypted_only' param.
    * Malformed email address.
* Add a helper function for smtp-relay.
* Assert params for initializing SMTPFactory.
* Use mail.util.parseaddr to parse email address.
* Use email.message.Message to represent an email message in smtp-relay.
* Make requirements effective and fix leap.common version in setup.py.
* Add/remove dependencies in setup.py.
* Fix Soledad instantiation in tests.
* Fix sender address in smtp-relay.
* Fix some comments regarding twisted's SSL and SMTP.
* Remove authentication from smtp-relay when sending.

This closes #2446.
---
 mail/setup.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'mail/setup.py')

diff --git a/mail/setup.py b/mail/setup.py
index 4de7251..8d4e415 100644
--- a/mail/setup.py
+++ b/mail/setup.py
@@ -21,10 +21,15 @@ from setuptools import setup, find_packages
 
 requirements = [
     "leap.soledad",
-    "leap.common",
+    "leap.common>=0.2.3-dev",
     "twisted",
 ]
 
+tests_requirements = [
+    'setuptools-trial',
+    'mock',
+]
+
 # XXX add classifiers, docs
 
 setup(
@@ -40,7 +45,8 @@ setup(
     ),
     namespace_packages=["leap"],
     package_dir={'': 'src'},
-    packages=find_packages('src'),
-    #test_suite='leap.mail.tests',
-    #install_requires=requirements,
+    packages=find_packages('src', exclude=['leap.mail.tests']),
+    test_suite='leap.mail.tests',
+    install_requires=requirements,
+    tests_require=tests_requirements,
 )
-- 
cgit v1.2.3