Merge pull request #56 from HDE/master

Release v0.1.9
HDE · Nov 15, 2019 · 1c73031 · 1c73031
2 parents 2337abd + 5b9d3ea
commit 1c73031
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 16 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -22,3 +22,28 @@ Version 0.1.4
 -------------
 
     - Support Python 3.6.
+
+Version 0.1.5
+-------------
+
+    - Support reading environment variables from file.
+
+Version 0.1.6
+-------------
+
+    - Add timeout feature for Windows.
+
+Version 0.1.7
+-------------
+
+    - Add tests in CI.
+
+Version 0.1.8
+-------------
+
+    - Support running as a library.
+
+Version 0.1.9
+-------------
+
+    - Support latest boto3.
diff --git a/lambda_local/__init__.py b/lambda_local/__init__.py
@@ -1,7 +1,7 @@
 '''
 python-lambda-local: Main module
 
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 

diff --git a/lambda_local/context.py b/lambda_local/context.py
@@ -1,5 +1,5 @@
 '''
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 from __future__ import print_function

diff --git a/lambda_local/event.py b/lambda_local/event.py
@@ -1,5 +1,5 @@
 '''
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 

diff --git a/lambda_local/main.py b/lambda_local/main.py
@@ -1,5 +1,5 @@
 '''
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 
@@ -10,7 +10,6 @@
 import logging
 import os
 import timeit
-from botocore.vendored.requests.packages import urllib3
 import multiprocessing
 
 from . import event
@@ -22,7 +21,6 @@
 logging.basicConfig(stream=sys.stdout,
                     level=logging.INFO,
                     format='[%(name)s - %(levelname)s - %(asctime)s] %(message)s')
-urllib3.disable_warnings()
 
 
 ERR_TYPE_EXCEPTION = 0

diff --git a/lambda_local/timeout.py b/lambda_local/timeout.py
@@ -1,5 +1,5 @@
 '''
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 '''
 python-lambda-local: Run lambda function in python on local machine.
 
-Copyright 2015-2018 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT.
 '''
 import io
@@ -23,7 +23,11 @@ def run_tests(self):
         sys.exit(pytest.main(self.test_args))
 
 
-version = "0.1.8"
+version = "0.1.9"
+
+TEST_REQUIRE = ['pytest']
+if sys.version_info[0] == 2:
+    TEST_REQUIRE = ['pytest==4.6.3']
 
 setup(name="python-lambda-local",
       version=version,
@@ -34,7 +38,7 @@ def run_tests(self):
           'Operating System :: POSIX',
           'Programming Language :: Python',
           'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'License :: OSI Approved :: MIT License'
       ],
       keywords="AWS Lambda",
@@ -45,7 +49,7 @@ def run_tests(self):
       packages=find_packages(exclude=['examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
-      tests_require=['pytest'],
+      tests_require=TEST_REQUIRE,
       cmdclass={'test': PyTest},
       install_requires=['boto3'],
       entry_points={

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -5,6 +5,6 @@
 Organize tests into files, each named xxx_test.py
 Read more here: http://pytest.org/
 
-Copyright 2015 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT
 '''
diff --git a/tests/basic_test.py b/tests/basic_test.py
@@ -5,7 +5,7 @@
 Write each test as a function named test_<something>.
 Read more here: http://pytest.org/
 
-Copyright 2015 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT
 '''
 

diff --git a/tests/test_direct_invocations.py b/tests/test_direct_invocations.py
@@ -4,7 +4,7 @@
 
 Meant for use with py.test.
 
-Copyright 2015 HDE, Inc.
+Copyright 2015-2019 HENNGE K.K. (formerly known as HDE, Inc.)
 Licensed under MIT
 '''
 import json

diff --git a/wercker.yml b/wercker.yml
@@ -1,4 +1,4 @@
-box: python:2.7-slim
+box: python:3.7-slim
 
 build:
   steps:
@@ -32,7 +32,7 @@ build-py2:
           python setup.py test
 
 build-py3:
-  box: python:3.6-slim
+  box: python:3.7-slim
   steps:
     - script:
         name: virtualenv install