M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

setup: install frontend tools, remove nosetest dependency, minor fixes

This commit is contained in:
Sebastien Bourdeauducq 2014-12-10 12:13:10 +08:00
parent 87fdad97ca
commit 0dc4eb02ae
9 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
artiq/management/__init__.py Normal file
View File

0
artiq/test/__init__.py Normal file
View File

0
test/full_stack.py → artiq/test/full_stack.py
View File

0
test/pc_rpc.py → artiq/test/pc_rpc.py
View File

0
test/py2llvm.py → artiq/test/py2llvm.py
View File

0
test/serialization.py → artiq/test/serialization.py
View File

0
test/transforms.py → artiq/test/transforms.py
View File

2
doc/manual/installing.rst
View File

@ -164,7 +164,7 @@ Xubuntu 14.04 specific instructions
This command installs all the required packages: :: 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. Note that ARTIQ requires Python 3.4 or above.

43
setup.py
View File

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