Merge pull request #986 from untergeek/remove_mock

No mock with frozen binaries

curator/_version.py

@@ -1,2 +1,2 @@
-__version__ = '5.1.0'
+__version__ = '5.1.1'
 

curator/utils.py

@@ -3,7 +3,6 @@
 import time
 import logging
 import yaml, os, re, sys
-import mock
 from voluptuous import Schema
 from .exceptions import *
 from .defaults import settings
@@ -123,7 +122,8 @@ def verify_client_object(test):
     :rtype: None
     """
     # Ignore mock type for testing
-    if isinstance(test, mock.Mock) or isinstance(test, mock.mock.Mock):
+    if str(type(test)) == "<class 'mock.Mock'>" or \
+        str(type(test)) == "<class 'mock.mock.Mock'>":
         pass
     elif not isinstance(test, elasticsearch.Elasticsearch):
         raise TypeError(

docs/Changelog.rst

@@ -3,6 +3,13 @@
 Changelog
 =========
 
+5.1.1 (8 June 2017)
+
+**Bug Fixes**
+
+  * Mock and cx_Freeze don't play well together.  Packages weren't working, so
+    I reverted the string-based comparison as before.
+
 5.1.0 (8 June 2017)
 
 **New Features**

docs/asciidoc/index.asciidoc

@@ -1,4 +1,4 @@
-:curator_version: 5.1.0
+:curator_version: 5.1.1
 :curator_major: 5
 :curator_doc_tree: 5.1
 :es_py_version: 5.4.0

requirements.txt

@@ -3,5 +3,4 @@ elasticsearch>=5.4.0,<6.0.0
 click>=6.7
 pyyaml>=3.10
 voluptuous>=0.9.3
-certifi>=2017.4.17
-mock>=2.0.0
+certifi>=2017.4.17

setup.py

@@ -27,7 +27,6 @@ def get_install_requires():
     res.append('pyyaml>=3.10')
     res.append('voluptuous>=0.9.3')
     res.append('certifi>=2017.4.17')
-    res.append('mock>=2.0.0')
     return res
 
 try: