diff --git a/f4pga/__init__.py b/f4pga/__init__.py index a9f7e84..1dde882 100755 --- a/f4pga/__init__.py +++ b/f4pga/__init__.py @@ -508,18 +508,14 @@ def get_platform_name_for_part(part_name: str): The reason for such distinction is that plenty of chips with different names differ only in a type of package they use. """ - - d: dict - with open(os.path.join(mypath, 'part_db/parts.json')) as f: - d = json.loads(f.read()) - return d.get(part_name.upper()) + with (Path(mypath) / 'part_db.json').open('r') as rfptr: + return json.load(rfptr).get(part_name.upper()) def cmd_build(args: Namespace): """ sfbuild's `build` command implementation """ project_flow_cfg: ProjectFlowConfig = None - platform = args.platform if platform is None: if args.part: diff --git a/f4pga/part_db/parts.json b/f4pga/part_db.json similarity index 100% rename from f4pga/part_db/parts.json rename to f4pga/part_db.json diff --git a/f4pga/setup.py b/f4pga/setup.py index acb8ad9..1c96d23 100644 --- a/f4pga/setup.py +++ b/f4pga/setup.py @@ -85,7 +85,7 @@ setuptools_setup( ], package_dir={"f4pga": "."}, package_data={ - 'f4pga': ['platforms/*.json'], + 'f4pga': ['*.json', 'platforms/*.json'], 'f4pga.wrappers.sh': ['xc7/*.f4pga.sh', 'quicklogic/*.f4pga.sh'] }, classifiers=[],