Resolve Confilcts

PMEAL · Feb 16, 2017 · 8f57eda · 8f57eda
2 parents 168b583 + 58efd04
commit 8f57eda
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 133 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ language: python
 python:
   - "3.4"
   - "3.5"
+  - "3.6"
 
 before_install:
   - export DISPLAY=:99.0

diff --git a/OpenPNM/Base/__ModelsDict__.py b/OpenPNM/Base/__ModelsDict__.py
@@ -353,7 +353,7 @@ def reorder(self, new_order):
             order.remove(item)
         # Add models back to list in new order
         inv_dict = {v: k for k, v in new_order.items()}
-        for item in inv_dict:
+        for item in sorted(inv_dict):
             order.insert(item, inv_dict[item])
         # Now rebuild models OrderedDict in new order
         for item in order: