From 0dc4eb02aed6770af2fe88219e90996c8344eabe Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 10 Dec 2014 12:13:10 +0800
Subject: [PATCH] setup: install frontend tools, remove nosetest dependency,
 minor fixes

---
 artiq/management/__init__.py          |  0
 artiq/test/__init__.py                |  0
 {test => artiq/test}/full_stack.py    |  0
 {test => artiq/test}/pc_rpc.py        |  0
 {test => artiq/test}/py2llvm.py       |  0
 {test => artiq/test}/serialization.py |  0
 {test => artiq/test}/transforms.py    |  0
 doc/manual/installing.rst             |  2 +-
 setup.py                              | 43 ++++++++++++++-------------
 9 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 artiq/management/__init__.py
 create mode 100644 artiq/test/__init__.py
 rename {test => artiq/test}/full_stack.py (100%)
 rename {test => artiq/test}/pc_rpc.py (100%)
 rename {test => artiq/test}/py2llvm.py (100%)
 rename {test => artiq/test}/serialization.py (100%)
 rename {test => artiq/test}/transforms.py (100%)

diff --git a/artiq/management/__init__.py b/artiq/management/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/artiq/test/__init__.py b/artiq/test/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/full_stack.py b/artiq/test/full_stack.py
similarity index 100%
rename from test/full_stack.py
rename to artiq/test/full_stack.py
diff --git a/test/pc_rpc.py b/artiq/test/pc_rpc.py
similarity index 100%
rename from test/pc_rpc.py
rename to artiq/test/pc_rpc.py
diff --git a/test/py2llvm.py b/artiq/test/py2llvm.py
similarity index 100%
rename from test/py2llvm.py
rename to artiq/test/py2llvm.py
diff --git a/test/serialization.py b/artiq/test/serialization.py
similarity index 100%
rename from test/serialization.py
rename to artiq/test/serialization.py
diff --git a/test/transforms.py b/artiq/test/transforms.py
similarity index 100%
rename from test/transforms.py
rename to artiq/test/transforms.py
diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
index 9b1593fb3..f51b99bd4 100644
--- 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
index 1e7e6894e..94d9f4cf4 100755
--- 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"))
+)