Skip to content

Commit d0d374e

Browse files
Merge pull request #55 from yxd-hde/i-54
Remove config on vendored library because it is removed.
2 parents 49ad011 + 6429155 commit d0d374e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lambda_local/main.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import logging
1111
import os
1212
import timeit
13-
from botocore.vendored.requests.packages import urllib3
1413
import multiprocessing
1514

1615
from . import event
@@ -22,7 +21,6 @@
2221
logging.basicConfig(stream=sys.stdout,
2322
level=logging.INFO,
2423
format='[%(name)s - %(levelname)s - %(asctime)s] %(message)s')
25-
urllib3.disable_warnings()
2624

2725

2826
ERR_TYPE_EXCEPTION = 0

setup.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ def run_tests(self):
2525

2626
version = "0.1.8"
2727

28+
TEST_REQUIRE = ['pytest']
29+
if sys.version_info[0] == 2:
30+
TEST_REQUIRE = ['pytest==4.6.3']
31+
2832
setup(name="python-lambda-local",
2933
version=version,
3034
description="Run lambda function in python on local machine.",
@@ -45,7 +49,7 @@ def run_tests(self):
4549
packages=find_packages(exclude=['examples', 'tests']),
4650
include_package_data=True,
4751
zip_safe=False,
48-
tests_require=['pytest'],
52+
tests_require=TEST_REQUIRE,
4953
cmdclass={'test': PyTest},
5054
install_requires=['boto3'],
5155
entry_points={

0 commit comments

Comments
 (0)