Skip to content

Commit 70d9ff9

Browse files
committed
Merge with master
2 parents cc40d0a + b8a6bf9 commit 70d9ff9

4 files changed

Lines changed: 50 additions & 24 deletions

File tree

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 MercadoPago Developers
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

MANIFEST.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
include README.rst
1+
include README.rst
2+
include LICENSE

mercadopago/mercadopago.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from identificationtype import IdentificationType
1111
from merchantorder import MerchantOrder
1212

13+
1314
class MP(object):
1415
version = "2.0.0"
1516
__sandbox = False

setup.py

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33

44
from distutils.core import Command
55

6+
67
class Tests(Command):
7-
'''run tests'''
8+
"""run tests"""
89

9-
description = 'runs unittest to execute all tests'
10+
description = "runs unittest to execute all tests"
1011

1112
user_options = []
13+
1214
def initialize_options(self):
1315
pass
1416

@@ -17,32 +19,33 @@ def finalize_options(self):
1719

1820
def run(self):
1921
import unittest
22+
2023
runner = unittest.runner.TextTestRunner()
2124
test_loader = unittest.TestLoader()
22-
test = test_loader.discover('tests')
25+
test = test_loader.discover("tests")
2326
runner.run(test)
2427

2528

2629
setup(
27-
name='mercadopago',
28-
version='2.0.0',
29-
author='MP SDK <mp_sdk@mercadopago.com>',
30-
author_email='mp_sdk@mercadopago.com',
31-
keywords='api mercadopago checkout payment ipn sdk integration',
32-
packages=['mercadopago'],
33-
url='https://github.com/mercadopago/sdk-python',
34-
description='Mercadopago SDK module for Payments integration',
35-
long_description=open('README.rst').read(),
36-
install_requires='requests>=2.4.3',
37-
cmdclass = {'test': Tests},
30+
name="mercadopago",
31+
version="2.0.0",
32+
author="MP SDK <mp_sdk@mercadopago.com>",
33+
author_email="mp_sdk@mercadopago.com",
34+
keywords="api mercadopago checkout payment ipn sdk integration",
35+
packages=["mercadopago"],
36+
url="https://github.com/mercadopago/sdk-python",
37+
description="Mercadopago SDK module for Payments integration",
38+
long_description=open("README.rst").read(),
39+
install_requires="requests>=2.4.3",
40+
cmdclass={"test": Tests},
3841
classifiers=[
39-
'Development Status :: 4 - Beta',
40-
'Intended Audience :: Developers',
41-
'Operating System :: OS Independent',
42-
'Programming Language :: Python',
43-
'Programming Language :: Python :: 2',
44-
'Programming Language :: Python :: 3.4',
45-
'Topic :: Software Development :: Libraries :: Python Modules',
46-
'License :: Freely Distributable',
47-
]
42+
"Development Status :: 4 - Beta",
43+
"Intended Audience :: Developers",
44+
"Operating System :: OS Independent",
45+
"Programming Language :: Python",
46+
"Programming Language :: Python :: 2",
47+
"Programming Language :: Python :: 3.4",
48+
"Topic :: Software Development :: Libraries :: Python Modules",
49+
"License :: Freely Distributable",
50+
],
4851
)

0 commit comments

Comments
 (0)