Merge branch 'reorder_imports' into merge_all

Author: syntron

OMPython/ModelicaSystem.py

@@ -37,7 +37,6 @@
 import itertools
 import logging
 import numbers
-import numpy as np
 import os
 import queue
 import textwrap
@@ -46,6 +45,8 @@
 import warnings
 import xml.etree.ElementTree as ET
 
+import numpy as np
+
 from OMPython.OMCSession import (OMCSessionException, OMCSessionRunData, OMCSessionZMQ,
                                  OMCProcess, OMCPath)
 

OMPython/OMCSession.py

@@ -42,8 +42,6 @@
 import os
 import pathlib
 import platform
-import psutil
-import pyparsing
 import re
 import shutil
 import signal
@@ -56,6 +54,9 @@
 import warnings
 import zmq
 
+import psutil
+import pyparsing
+
 # TODO: replace this with the new parser
 from OMPython.OMTypedParser import parseString as om_parser_typed
 from OMPython.OMParser import om_parser_basic