ActiveData is getting old, time to fix the requirements.txt

requirements.txt

@@ -1,11 +1,9 @@
-hjson
-urllib3==1.24.3
-Flask
-pymysql
-requests
+hjson==3.0.1
+urllib3==1.22
+Flask==0.10.1
+pymysql==0.8.0
+requests==2.18.4
 moz-sql-parser
 boto==2.48.0
-ujson
-beautifulsoup4
-cryptography
-
+beautifulsoup4==4.6.0
+cryptography==2.1.4

vendor/jx_elasticsearch/es52/set_op.py

@@ -310,7 +310,7 @@ def es_setop(es, query):
     es_query.size = coalesce(query.limit, DEFAULT_LIMIT)
     es_query.sort = jx_sort_to_es_sort(query.sort, schema)
 
-    with Timer("call to ES", silent=DEBUG) as call_timer:
+    with Timer("call to ES", verbose=DEBUG) as call_timer:
         result = es.search(es_query)
 
     T = result.hits.hits

vendor/mo_json/encoder.py

@@ -122,22 +122,6 @@ def encode(self, value, pretty=False):
             raise e
 
 
-def ujson_encode(value, pretty=False):
-    if pretty:
-        return pretty_json(value)
-
-    try:
-        scrubbed = scrub(value)
-        return ujson_dumps(scrubbed, ensure_ascii=False, sort_keys=True, escape_forward_slashes=False).decode('utf8')
-    except Exception as e:
-        from mo_logs.exceptions import Except
-        from mo_logs import Log
-
-        e = Except.wrap(e)
-        Log.warning("problem serializing {{type}}", type=text(repr(value)), cause=e)
-        raise e
-
-
 def _value2json(value, _buffer):
     try:
         _class = value.__class__
@@ -501,14 +485,9 @@ def unicode_key(key):
     return quote(text(key))
 
 
-# OH HUM, cPython with uJSON, OR pypy WITH BUILTIN JSON?
-# http://liangnuren.wordpress.com/2012/08/13/python-json-performance/
-# http://morepypy.blogspot.ca/2011/10/speeding-up-json-encoding-in-pypy.html
 if PYPY:
     json_encoder = pypy_json_encode
 else:
-    # from ujson import dumps as ujson_dumps
-    # json_encoder = ujson_encode
     json_encoder = cPythonJSONEncoder().encode