occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

kasli_generic: warn if min_artiq_version is not met

This commit is contained in:
Astro 2021-02-10 00:52:23 +01:00 committed by Sébastien Bourdeauducq
parent 4b2ed67dd7
commit 461199b903
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.rst
View File

@ -49,7 +49,8 @@ Highlights:
with reproducible builds. with reproducible builds.
* Python 3.7 support in Conda packages. * Python 3.7 support in Conda packages.
* `kasli_generic` JSON descriptions are now validated against a * `kasli_generic` JSON descriptions are now validated against a
schema. Description defaults have moved from Python to the schema. schema. Description defaults have moved from Python to the
schema. Warns if ARTIQ version is too old.
Breaking changes: Breaking changes:

9
artiq/gateware/targets/kasli_generic.py
View File

@ -1,16 +1,20 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
import logging
from distutils.version import LooseVersion
from misoc.integration.builder import builder_args, builder_argdict from misoc.integration.builder import builder_args, builder_argdict
from misoc.targets.kasli import soc_kasli_args, soc_kasli_argdict from misoc.targets.kasli import soc_kasli_args, soc_kasli_argdict
from artiq import __version__ as artiq_version
from artiq.coredevice import jsondesc from artiq.coredevice import jsondesc
from artiq.gateware import rtio, eem_7series from artiq.gateware import rtio, eem_7series
from artiq.gateware.rtio.phy import ttl_simple from artiq.gateware.rtio.phy import ttl_simple
from artiq.gateware.targets.kasli import StandaloneBase, MasterBase, SatelliteBase from artiq.gateware.targets.kasli import StandaloneBase, MasterBase, SatelliteBase
from artiq.build_soc import * from artiq.build_soc import *
logger = logging.getLogger(__name__)
class GenericStandalone(StandaloneBase): class GenericStandalone(StandaloneBase):
def __init__(self, description, hw_rev=None,**kwargs): def __init__(self, description, hw_rev=None,**kwargs):
@ -139,6 +143,11 @@ def main():
args = parser.parse_args() args = parser.parse_args()
description = jsondesc.load(args.description) description = jsondesc.load(args.description)
min_artiq_version = description.get("min_artiq_version", "0")
if LooseVersion(artiq_version) < LooseVersion(min_artiq_version):
logger.warning("ARTIQ version mismatch: current %s < %s minimum",
artiq_version, min_artiq_version)
if description["target"] != "kasli": if description["target"] != "kasli":
raise ValueError("Description is for a different target") raise ValueError("Description is for a different target")