Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eb42cf2bb4d3
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dc4eb02aed6
Choose a head ref
  • 2 commits
  • 11 files changed
  • 1 contributor

Commits on Dec 10, 2014

  1. Copy the full SHA
    87fdad9 View commit details
  2. Copy the full SHA
    0dc4eb0 View commit details
6 changes: 4 additions & 2 deletions artiq/devices/lda/lda_client.py
Original file line number Diff line number Diff line change
@@ -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()
6 changes: 4 additions & 2 deletions artiq/devices/lda/lda_controller.py
Original file line number Diff line number Diff line change
@@ -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()
Empty file added artiq/management/__init__.py
Empty file.
Empty file added artiq/test/__init__.py
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -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.

43 changes: 23 additions & 20 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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"))
)