From 8d3e95cd1a54a4ad877aeaf6ed1dee2dea17428d Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Fri, 14 Dec 2018 09:58:15 -0800 Subject: [PATCH] Move xjson / xyaml to utils instead of prjxray. Signed-off-by: Tim 'mithro' Ansell --- fuzzers/001-part-yaml/Makefile | 2 +- fuzzers/005-tilegrid/generate.py | 2 +- fuzzers/074-dump_all/cleanup_site_pins.py | 2 +- fuzzers/074-dump_all/create_node_tree.py | 2 +- fuzzers/074-dump_all/generate_grid.py | 2 +- fuzzers/074-dump_all/reduce_site_types.py | 2 +- fuzzers/074-dump_all/reduce_tile_types.py | 2 +- {prjxray => utils}/xjson.py | 0 {prjxray => utils}/xyaml.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename {prjxray => utils}/xjson.py (100%) rename {prjxray => utils}/xyaml.py (98%) diff --git a/fuzzers/001-part-yaml/Makefile b/fuzzers/001-part-yaml/Makefile index 2de00c35..d4d84248 100644 --- a/fuzzers/001-part-yaml/Makefile +++ b/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 diff --git a/fuzzers/005-tilegrid/generate.py b/fuzzers/005-tilegrid/generate.py index 0bcd6d69..6924b69b 100644 --- a/fuzzers/005-tilegrid/generate.py +++ b/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): diff --git a/fuzzers/074-dump_all/cleanup_site_pins.py b/fuzzers/074-dump_all/cleanup_site_pins.py index 84db9300..5ae67494 100644 --- a/fuzzers/074-dump_all/cleanup_site_pins.py +++ b/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 _XY. # Generally speaking, only the tile relatively coordinates are required to diff --git a/fuzzers/074-dump_all/create_node_tree.py b/fuzzers/074-dump_all/create_node_tree.py index 20e4e8d6..e7834ec8 100644 --- a/fuzzers/074-dump_all/create_node_tree.py +++ b/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): diff --git a/fuzzers/074-dump_all/generate_grid.py b/fuzzers/074-dump_all/generate_grid.py index da1c1950..fb55e8e6 100644 --- a/fuzzers/074-dump_all/generate_grid.py +++ b/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): diff --git a/fuzzers/074-dump_all/reduce_site_types.py b/fuzzers/074-dump_all/reduce_site_types.py index b102d10d..517a8335 100644 --- a/fuzzers/074-dump_all/reduce_site_types.py +++ b/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(): diff --git a/fuzzers/074-dump_all/reduce_tile_types.py b/fuzzers/074-dump_all/reduce_tile_types.py index bbe81a93..58163699 100644 --- a/fuzzers/074-dump_all/reduce_tile_types.py +++ b/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): diff --git a/prjxray/xjson.py b/utils/xjson.py similarity index 100% rename from prjxray/xjson.py rename to utils/xjson.py diff --git a/prjxray/xyaml.py b/utils/xyaml.py similarity index 98% rename from prjxray/xyaml.py rename to utils/xyaml.py index 5b9d8a7f..08e9e357 100644 --- a/prjxray/xyaml.py +++ b/utils/xyaml.py @@ -5,7 +5,7 @@ import yaml import json import unittest -from prjxray import xjson +from utils import xjson def load(f):