m-labs · Dec 10, 2014 · Dec 10, 2014
diff --git a/artiq/devices/lda/lda_client.py b/artiq/devices/lda/lda_client.py
@@ -5,8 +5,7 @@
 from artiq.management.pc_rpc import Client
 
 
-if __name__ == "__main__":
-
+def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', '--server', default="::1",
                         help="The IP address or hostname of the controller")
@@ -25,3 +24,6 @@
             remote.set_attenuation(args.attenuation)
     finally:
         remote.close_rpc()
+
+if __name__ == "__main__":
+    main()
diff --git a/artiq/devices/lda/lda_controller.py b/artiq/devices/lda/lda_controller.py
@@ -165,8 +165,7 @@ def set_attenuation(self, attenuation):
         """
         self.set(0x8d, bytes(chr(int(round(attenuation*4))), 'ascii'))
 
-
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('-d', '--device', default="LDA-102",
                         choices=["LDA-102", "LDA-602", "sim"])
@@ -185,3 +184,6 @@ def set_attenuation(self, attenuation):
 
     simple_server_loop(lda, "lda",
                        args.bind, args.port)
+
+if __name__ == "__main__":
+    main()
diff --git a/artiq/management/__init__.py b/artiq/management/__init__.py
diff --git a/artiq/test/__init__.py b/artiq/test/__init__.py
diff --git a/test/full_stack.py → artiq/test/full_stack.py b/test/full_stack.py → artiq/test/full_stack.py
diff --git a/test/pc_rpc.py → artiq/test/pc_rpc.py b/test/pc_rpc.py → artiq/test/pc_rpc.py
diff --git a/test/py2llvm.py → artiq/test/py2llvm.py b/test/py2llvm.py → artiq/test/py2llvm.py
diff --git a/test/serialization.py → artiq/test/serialization.py b/test/serialization.py → artiq/test/serialization.py
diff --git a/test/transforms.py → artiq/test/transforms.py b/test/transforms.py → artiq/test/transforms.py
diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
@@ -164,7 +164,7 @@ Xubuntu 14.04 specific instructions
 
 This command installs all the required packages: ::
 
-    $ sudo apt-get install build-essential autotools-dev file git patch perl xutils-devs python3-pip texinfo flex bison libmpc-dev python3-setuptools python3-numpy python3-scipy python3-sphinx python3-nose python3-dev python-dev subversion cmake libusb-dev libftdi-dev pkg-config
+    $ sudo apt-get install build-essential autotools-dev file git patch perl xutils-devs python3-pip texinfo flex bison libmpc-dev python3-setuptools python3-numpy python3-scipy python3-sphinx python3-dev python-dev subversion cmake libusb-dev libftdi-dev pkg-config
 
 Note that ARTIQ requires Python 3.4 or above.
 

diff --git a/setup.py b/setup.py
@@ -1,26 +1,29 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf8 -*-
 
 from setuptools import setup, find_packages
 from glob import glob
+import os
+
 
 setup(
-        name = "artiq",
-        version = "0.0+dev",
-        author = u"Sébastien Bourdeauducq & NIST Ion Storage Group",
-        author_email = "sb@m-labs.hk",
-        url = "http://github.com/m-labs/artiq/",
-        description = "Experiment Control",
-        long_description = open("README.rst").read(),
-        license = "BSD",
-        install_requires = [
-            "numpy", "scipy", "sphinx", "numpydoc", "nose",
-        ],
-        extras_require = {},
-        dependency_links = [],
-        packages = find_packages(),
-        namespace_packages = [],
-        test_suite = "nose.collector",
-        include_package_data = True,
-        ext_modules=[],
-        )
+    name = "artiq",
+    version = "0.0+dev",
+    author = "M-Labs / NIST Ion Storage Group",
+    author_email = "sb@m-labs.hk",
+    url = "http://m-labs.hk/artiq",
+    description = "A control system for trapped-ion experiments",
+    long_description = open("README.rst").read(),
+    license = "BSD",
+    install_requires = [
+        "sphinx", "numpy", "scipy"
+    ],
+    extras_require = {},
+    dependency_links = [],
+    packages = find_packages(),
+    namespace_packages = [],
+    test_suite = "artiq.test",
+    include_package_data = True,
+    ext_modules=[],
+    scripts=glob(os.path.join("frontend", "*.py"))
+)