From 39e9e73ff34dbd1b81cfb47c7ac64c9e242363c2 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Fri, 26 Jun 2015 12:37:15 -0600 Subject: [PATCH] language: allow experiments to import from artiq.language this way the import stanza shows what is imported: just experiment language related components keep the imports also at top level until experiments have transitioned the top level __init__.py should build and expose the entire namespace of artiq related things, like hdf5 analysis tools, frontend components (like experiment running api), deployment tools etc. --- artiq/__init__.py | 6 ++---- artiq/language/__init__.py | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/artiq/__init__.py b/artiq/__init__.py index ebdb62601..7e6404c1e 100644 --- a/artiq/__init__.py +++ b/artiq/__init__.py @@ -1,4 +1,2 @@ -from artiq.language.core import * -from artiq.language.experiment import Experiment -from artiq.language.db import * -from artiq.language.units import * +from artiq import language +from artiq.language import * diff --git a/artiq/language/__init__.py b/artiq/language/__init__.py index e69de29bb..ebdb62601 100644 --- a/artiq/language/__init__.py +++ b/artiq/language/__init__.py @@ -0,0 +1,4 @@ +from artiq.language.core import * +from artiq.language.experiment import Experiment +from artiq.language.db import * +from artiq.language.units import *