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: 7289c18a42cc
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: 716ee228a2ee
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 27, 2014

  1. Copy the full SHA
    7412288 View commit details
  2. gitignore: add setup.py things

    jordens authored and sbourdeauducq committed Sep 27, 2014
    Copy the full SHA
    716ee22 View commit details
Showing with 29 additions and 0 deletions.
  1. +3 −0 .gitignore
  2. 0 README.rst
  3. 0 artiq/__init__.py
  4. +26 −0 setup.py
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -5,3 +5,6 @@ __pycache__
*.elf
*.fbi
doc/manual/_build
/build
/dist
/*.egg-info
Empty file added README.rst
Empty file.
Empty file added artiq/__init__.py
Empty file.
26 changes: 26 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/python
# -*- coding: utf8 -*-

from setuptools import setup, find_packages
from glob import glob

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=[],
)