Move xjson / xyaml to utils instead of prjxray.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>

fuzzers/001-part-yaml/Makefile

@@ -10,7 +10,7 @@ $(SPECIMENS): Makefile.specimen
 
 pushdb:
 	cp ${XRAY_PART}.yaml ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)
-	python -m prjxray.xyaml ${XRAY_PART}.yaml > ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/${XRAY_PART}.json
+	python -m utils.xyaml ${XRAY_PART}.yaml > ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/${XRAY_PART}.json
 
 run:
 	$(MAKE) clean

fuzzers/005-tilegrid/generate.py

@@ -2,7 +2,7 @@
 
 import os, sys, json, re
 
-from prjxray import xjson
+from utils import xjson
 
 
 def load_tiles(tiles_fn):

fuzzers/074-dump_all/cleanup_site_pins.py

@@ -15,7 +15,7 @@ import re
 import sys
 import copy
 
-from prjxray import xjson
+from utils import xjson
 
 # All site names appear to follow the pattern <type>_X<abs coord>Y<abs coord>.
 # Generally speaking, only the tile relatively coordinates are required to

fuzzers/074-dump_all/create_node_tree.py

@@ -6,7 +6,7 @@ import prjxray.lib
 import pickle
 import collections
 
-from prjxray import xjson
+from utils import xjson
 
 
 def build_node_index(fname):

fuzzers/074-dump_all/generate_grid.py

@@ -13,7 +13,7 @@ import datetime
 import pickle
 import sys
 
-from prjxray import xjson
+from utils import xjson
 
 
 def get_tile_grid_info(fname):

fuzzers/074-dump_all/reduce_site_types.py

@@ -12,7 +12,7 @@ import os
 import os.path
 import re
 
-from prxray import xjson
+from utils import xjson
 
 
 def main():

fuzzers/074-dump_all/reduce_tile_types.py

@@ -18,7 +18,7 @@ import multiprocessing
 import os
 import functools
 
-from prxray import xjson
+from utils import xjson
 
 
 def check_and_strip_prefix(name, prefix):

utils/xyaml.py

@@ -5,7 +5,7 @@ import yaml
 import json
 import unittest
 
-from prjxray import xjson
+from utils import xjson
 
 
 def load(f):