Merge branch 'develop' of https://github.com/ActivitySim/activitysim …

…into develop
ActivitySim · Oct 23, 2020 · df28db7 · df28db7
2 parents ed201df + 9bd85ac
commit df28db7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/activitysim/__init__.py b/activitysim/__init__.py
@@ -1,5 +1,5 @@
 # ActivitySim
 # See full license in LICENSE.txt.
 
-__version__ = '0.9.5.1'
+__version__ = '0.9.5.2'
 __doc__ = 'Activity-Based Travel Modeling'
diff --git a/activitysim/core/orca.py b/activitysim/core/orca.py
@@ -982,8 +982,8 @@ def _collect_variables(names, expressions=None):
         expressions = []
     offset = len(names) - len(expressions)
     labels_map = dict(tz.concatv(
-        tz.compatibility.zip(names[:offset], names[:offset]),
-        tz.compatibility.zip(names[offset:], expressions)))
+        zip(names[:offset], names[:offset]),
+        zip(names[offset:], expressions)))
 
     all_variables = tz.merge(_INJECTABLES, _TABLES)
     variables = {}