Skip to content

Commit 1c73031

Browse files
authored
Merge pull request #56 from HDE/master
Release v0.1.9
2 parents 2337abd + 5b9d3ea commit 1c73031

11 files changed

+43
-16
lines changed

CHANGELOG.txt

+25
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,28 @@ Version 0.1.4
2222
-------------
2323

2424
- Support Python 3.6.
25+
26+
Version 0.1.5
27+
-------------
28+
29+
- Support reading environment variables from file.
30+
31+
Version 0.1.6
32+
-------------
33+
34+
- Add timeout feature for Windows.
35+
36+
Version 0.1.7
37+
-------------
38+
39+
- Add tests in CI.
40+
41+
Version 0.1.8
42+
-------------
43+
44+
- Support running as a library.
45+
46+
Version 0.1.9
47+
-------------
48+
49+
- Support latest boto3.

lambda_local/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'''
22
python-lambda-local: Main module
33
4-
Copyright 2015-2018 HDE, Inc.
4+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
55
Licensed under MIT.
66
'''
77

lambda_local/context.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
2-
Copyright 2015-2018 HDE, Inc.
2+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
33
Licensed under MIT.
44
'''
55
from __future__ import print_function

lambda_local/event.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
2-
Copyright 2015-2018 HDE, Inc.
2+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
33
Licensed under MIT.
44
'''
55

lambda_local/main.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
2-
Copyright 2015-2018 HDE, Inc.
2+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
33
Licensed under MIT.
44
'''
55

@@ -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

lambda_local/timeout.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
2-
Copyright 2015-2018 HDE, Inc.
2+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
33
Licensed under MIT.
44
'''
55

setup.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'''
22
python-lambda-local: Run lambda function in python on local machine.
33
4-
Copyright 2015-2018 HDE, Inc.
4+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
55
Licensed under MIT.
66
'''
77
import io
@@ -23,7 +23,11 @@ def run_tests(self):
2323
sys.exit(pytest.main(self.test_args))
2424

2525

26-
version = "0.1.8"
26+
version = "0.1.9"
27+
28+
TEST_REQUIRE = ['pytest']
29+
if sys.version_info[0] == 2:
30+
TEST_REQUIRE = ['pytest==4.6.3']
2731

2832
setup(name="python-lambda-local",
2933
version=version,
@@ -34,7 +38,7 @@ def run_tests(self):
3438
'Operating System :: POSIX',
3539
'Programming Language :: Python',
3640
'Programming Language :: Python :: 2.7',
37-
'Programming Language :: Python :: 3.6',
41+
'Programming Language :: Python :: 3.7',
3842
'License :: OSI Approved :: MIT License'
3943
],
4044
keywords="AWS Lambda",
@@ -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={

tests/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
Organize tests into files, each named xxx_test.py
66
Read more here: http://pytest.org/
77
8-
Copyright 2015 HDE, Inc.
8+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
99
Licensed under MIT
1010
'''

tests/basic_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Write each test as a function named test_<something>.
66
Read more here: http://pytest.org/
77
8-
Copyright 2015 HDE, Inc.
8+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
99
Licensed under MIT
1010
'''
1111

tests/test_direct_invocations.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
Meant for use with py.test.
66
7-
Copyright 2015 HDE, Inc.
7+
Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
88
Licensed under MIT
99
'''
1010
import json

wercker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
box: python:2.7-slim
1+
box: python:3.7-slim
22

33
build:
44
steps:
@@ -32,7 +32,7 @@ build-py2:
3232
python setup.py test
3333
3434
build-py3:
35-
box: python:3.6-slim
35+
box: python:3.7-slim
3636
steps:
3737
- script:
3838
name: virtualenv install

0 commit comments

Comments
 (0)