Merge pull request #1247 from mithro/small-cleanup

Couple of small cleanup changes

Makefile

@@ -7,7 +7,7 @@ ifeq ($(shell id -u),0)
 endif
 
 # Tools + Environment
-IN_ENV = if [ -e env/bin/activate ]; then . env/bin/activate; fi;
+IN_ENV = if [ -e env/bin/activate ]; then . env/bin/activate; fi; source utils/environment.python.sh;
 env:
 	virtualenv --python=python3 env
 	# Install prjxray

requirements.txt

@@ -3,6 +3,7 @@
 intervaltree
 junit-xml
 numpy
+openpyxl
 ordered-set
 parse
 progressbar2
@@ -14,4 +15,3 @@ simplejson
 sympy
 textx
 yapf==0.24.0
-openpyxl

utils/environment.python.sh

@@ -0,0 +1,6 @@
+# FIXME: fasm should be installed into the running Python environment.
+export PYTHONPATH="${XRAY_DIR}:${XRAY_DIR}/third_party/fasm:$PYTHONPATH"
+
+# Suppress the following warnings;
+# - env/lib/python3.7/distutils/__init__.py:4: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
+export PYTHONWARNINGS=ignore::DeprecationWarning:distutils

utils/environment.sh

@@ -18,7 +18,7 @@ fi
 
 # misc
 export XRAY_PART_YAML="${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/${XRAY_PART}/part.yaml"
-export PYTHONPATH="${XRAY_DIR}:${XRAY_DIR}/third_party/fasm:$PYTHONPATH"
+source $XRAY_UTILS_DIR/environment.python.sh
 
 # tools
 export XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh"

utils/find_missing_segbits.py

@@ -113,7 +113,7 @@ def main(argv):
     # List tile types
     tile_types = []
     for file in files:
-        match = re.match("^tile_type_(\w+).json$", file)
+        match = re.match("^tile_type_(\\w+).json$", file)
         if match:
             tile_types.append(match.group(1))