Skip to content

Commit 1ea1cde

Browse files
author
Andreu Vallbona
committed
Fixed installation issues and refactored tests
1 parent 7a5f8e4 commit 1ea1cde

25 files changed

+106
-83
lines changed

CHANGELOG.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
Change log
33
==========
44

5+
0.2.6 (2017-06-21)
6+
------------------
7+
8+
* Fixed installation issues and refactored tests
9+
10+
11+
0.2.3 (2017-06-21)
12+
------------------
13+
14+
* Fixed get_version issue on setup.py
15+
16+
517
0.2 (2017-06-21)
618
----------------
719

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017 Marc Galofré - APSL
1+
Copyright (c) 2017 - APSL
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

MANIFEST.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include AUTHORS
22
include LICENSE
3-
include CHANGELOG
3+
include CHANGELOG.rst
44
include README.rst
5-
recursive-include addonpayments-sdk-python *

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
AddonPayments SDK Python
22
========================
33

4+
.. image:: https://img.shields.io/pypi/v/addonpayments-sdk-python.svg
5+
:target: https://pypi.python.org/pypi/addonpayments-sdk-python
6+
47
AddonPayments SDK Python is a library that allows integration with the SDK's of AddonPayments in a easy and fast way.
58
There are two types of integration: HPP (Hosted Payment Page) and API.
69

addonpayments/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
__author__ = 'Marc Galofré'
44
__email__ = '[email protected]'
5-
__version__ = '0.2'
5+
__version__ = '0.2.6'

addonpayments/hpp/tests/__init__.py

Whitespace-only changes.

addonpayments/hpp/tests/conftest.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

setup.py

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,32 @@ def get_email(package):
3434
return re.search("^__email__ = ['\"]([^'\"]+)['\"]", init_py, re.MULTILINE).group(1)
3535

3636

37+
def get_long_description():
38+
"""
39+
return the long description from README.rst file
40+
:return:
41+
"""
42+
return codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read()
43+
44+
3745
setup(
3846
name='addonpayments-sdk-python',
3947
version=get_version('addonpayments'),
40-
packages=find_packages(exclude=('*.tests*')),
41-
include_package_data=True,
42-
keywords="addonpayments sdk python hpp api",
48+
author=get_author('addonpayments'),
49+
author_email=get_email('addonpayments'),
50+
url='https://github.com/ComerciaGP/addonpayments-Python-SDK',
51+
packages=find_packages(),
52+
license='BSD',
4353
description='A SDK Addonpayments implemented with Python.',
44-
long_description=codecs.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read(),
54+
long_description=get_long_description(),
4555
install_requires=[
56+
'six',
4657
'python-decouple',
4758
'attrs',
4859
'xmltodict',
4960
'requests',
50-
'future'
61+
'future',
5162
],
52-
url='https://gitlab.apsl.net/addonpayments/addonpayments-sdk-python',
53-
author=get_author('addonpayments'),
54-
author_email=get_email('addonpayments'),
5563
classifiers=[
5664
'Environment :: Web Environment',
5765
'Intended Audience :: Developers',
@@ -62,5 +70,7 @@ def get_email(package):
6270
'Programming Language :: Python :: 3.5',
6371
'Operating System :: OS Independent',
6472
'Topic :: Software Development'
65-
]
73+
],
74+
include_package_data=True,
75+
zip_safe=False,
6676
)
File renamed without changes.

addonpayments/api/tests/tests/test_card_storage.py renamed to tests/api/tests/test_card_storage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import pytest
66

7-
from addonpayments.api.tests.conftest import BaseTest
87
from addonpayments.api.card_storage.requests import (ReceiptInRequest, CardUpdateRequest, CardNewRequest,
98
CardCancelRequest, CardDccRateRequest, PayerNewRequest,
109
RealVaultThreeDsVerifyEnrolled, PayerEditRequest,
1110
AuthRequestWithRecurring)
1211
from addonpayments.api.client import ApiClient
12+
from tests.conftest import BaseTest
1313

1414

1515
class TestCardStorage(BaseTest):

0 commit comments

Comments
 (0)