Bumping version number, change classifier in setup.py from a tuple to…

… a list to avoid warning message, upaded tests to try to accomodate mock as builtin in python > 3.3

requirements.txt

@@ -1,3 +1,2 @@
-boto3==1.2.3
-mock==1.3.0
+boto3==1.8.6
 nose==1.3.7

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='placebo',
-    version='0.8.1',
+    version='0.8.2',
     description='Make boto3 calls that look real but have no effect',
     long_description=open('README.md').read(),
     author='Mitch Garnaat',
@@ -14,7 +14,7 @@
     packages=find_packages(exclude=['tests*']),
     package_dir={'placebo': 'placebo'},
     license="Apache License 2.0",
-    classifiers=(
+    classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
@@ -26,6 +26,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5'
-    ),
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7'
+    ],
 )

tests/unit/test_canned.py

@@ -16,7 +16,11 @@
 import os
 
 import boto3
-import mock
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 import placebo
 

tests/unit/test_pill.py

@@ -16,7 +16,11 @@
 import os
 
 import boto3
-import mock
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 import placebo.pill
 

tests/unit/test_save.py

@@ -17,7 +17,11 @@
 import shutil
 
 import boto3
-import mock
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 import placebo
 

tests/unit/test_utils.py

@@ -3,7 +3,11 @@
 import shutil
 
 import boto3
-import mock
+
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 from placebo.utils import placebo_session