Make payment a param for functions that need it

This allows us to reuse payment providers.

1 files changed, 7 insertions, 9 deletions

diff --git a/setup.py b/setup.py
index 68c2d00..85e9c1b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,39 +1,38 @@
 #!/usr/bin/env python
 from setuptools import setup
 import os
-import sys
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'test_settings')
 
 PACKAGES = [
     'payments',
     'payments.authorizenet',
+    'payments.braintree',
     'payments.cybersource',
     'payments.dummy',
     'payments.dotpay',
     'payments.paypal',
     'payments.sagepay',
+    'payments.sofort',
     'payments.stripe',
     'payments.wallet']
 
 REQUIREMENTS = [
+    'braintree>=3.14.0',
     'Django>=1.5',
     'pycrypto>=2.6',
-    'PyJWT',
+    'PyJWT>=1.3.0',
     'requests>=1.2.0',
     'stripe>=1.9.8',
-    'suds-jurko>=0.6']
-
-if sys.version_info < (3,):
-    PACKAGES += ['payments.braintree']
-    REQUIREMENTS += ['braintree>=2.24.1']
+    'suds-jurko>=0.6',
+    'xmltodict>=0.9.2']
 
 setup(
     name='django-payments',
     author='Mirumee Software',
     author_email='hello@mirumee.com',
     description='Universal payment handling for Django',
-    version='0.6.6',
+    version='0.7.0',
     url='http://github.com/mirumee/django-payments',
     packages=PACKAGES,
     include_package_data=True,
@@ -44,7 +43,6 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Framework :: Django',