lib updates

tests/resources/config/test_etl.json

@@ -105,7 +105,7 @@
 			"Referer": "https://github.com/mozilla/Bugzilla-ETL"
 		},
 		"mo_json.SNAP_TO_BASE_10": false,
-		"bugzilla_etl.parse_bug_history.DEBUG_MEMORY": true
+		"bugzilla_etl.parse_bug_history.DEBUG_MEMORY": false
 	},
 	"debug": {
 		"trace": true,

tests/test_etl.py

@@ -333,7 +333,7 @@ class TestETL(unittest.TestCase):
 
         database.make_test_instance(self.settings.bugzilla)
 
-        #MARK SOME BUGS PRIVATE
+        # MARK SOME BUGS PRIVATE
         with MySQL(self.settings.bugzilla) as db:
             for b in private_bugs:
                 database.add_bug_group(db, b, BUG_GROUP_FOR_TESTING)
@@ -346,9 +346,10 @@ class TestETL(unittest.TestCase):
             kwargs=self.settings
         )
 
-        #VERIFY BUG GROUP STILL EXISTS
+        # VERIFY BUG GROUP STILL EXISTS
+
         esq = jx_elasticsearch.new_instance(self.settings.private.bugs.es)
-        esq.namespace.get_columns(esq.name, force=True)
+        esq.namespace.get_columns(esq.name, after=Date.now())
         results = esq.query({
             "from": esq.name,
             "where": {"and": [

vendor/jx_elasticsearch/meta.py

@@ -9,10 +9,9 @@
 #
 from __future__ import absolute_import, division, unicode_literals
 
-from mo_future import is_text, is_binary
+import itertools
 from datetime import date, datetime
 from decimal import Decimal
-import itertools
 
 import jx_base
 from jx_base import TableDesc

vendor/jx_python/meta.py

@@ -720,6 +720,7 @@ _merge_order = {
     NullType: 1,
     bool: 2,
     int: 3,
+    long: 3,
     Date: 4,
     float: 5,
     text_type: 6,

vendor/mo_json/encoder.py

@@ -9,14 +9,13 @@
 #
 from __future__ import absolute_import, division, unicode_literals
 
-from mo_future import is_text, is_binary
+import json
+import math
+import time
 from datetime import date, datetime, timedelta
 from decimal import Decimal
-import json
 from json.encoder import encode_basestring
-import math
 from math import floor
-import time
 
 from mo_dots import Data, FlatList, Null, NullType, SLOT, is_data, is_list
 from mo_future import PYPY, binary_type, is_binary, is_text, long, sort_using_key, text_type, utf8_json_encoder, xrange

vendor/mo_kwargs/__init__.py

@@ -9,7 +9,6 @@
 #
 from __future__ import absolute_import, division, unicode_literals
 
-from mo_future import is_text, is_binary
 from mo_dots import get_logger, is_data, wrap, zip as dict_zip
 from mo_future import get_function_arguments, get_function_defaults, get_function_name, text_type
 from mo_logs import Except
@@ -121,16 +120,11 @@ def override(func):
 
 def params_pack(params, *args):
     settings = {}
-    for a in args:
+    for a in reversed(args):
         if a == None:
             continue
         for k, v in a.items():
-            if v == None:
-                continue
-            k = text_type(k)
-            if k in settings:
-                continue
-            settings[k] = v if v != None else None
+            settings[str(k)] = None if v == None else v
     settings["kwargs"] = settings
 
     output = {