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: 50c14db17aa4
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: 776381a33234
Choose a head ref
  • 3 commits
  • 26 files changed
  • 2 contributors

Commits on Feb 5, 2015

  1. Copy the full SHA
    4167e66 View commit details
  2. Copy the full SHA
    02a71e7 View commit details
  3. Copy the full SHA
    776381a View commit details
1 change: 1 addition & 0 deletions artiq/__init__.py
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@
from artiq.language.units import check_unit
from artiq.language.units import ps, ns, us, ms, s
from artiq.language.units import Hz, kHz, MHz, GHz
from artiq.gui.explib import *
13 changes: 8 additions & 5 deletions artiq/gui/explib.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import asyncio

from gi.repository import Gtk
import asyncio as _aio


class BaseControls:
def __init__(self, facilities):
self.facilities = facilities

@asyncio.coroutine
@_aio.coroutine
def build(self):
self.finalize()

@@ -21,8 +19,13 @@ def __init__(self, facilities, glade_file, top_widget_name="top"):
self.glade_file = glade_file
self.top_widget_name = top_widget_name

@asyncio.coroutine
@_aio.coroutine
def build(self):
# lazy import GTK so that the artiq top-level
# (which imports from us) can be imported on systems
# without GTK installed
from gi.repository import Gtk

self.builder = Gtk.Builder()
data = yield from self.facilities.get_data(self.glade_file)
self.builder.add_from_string(data)
1 change: 1 addition & 0 deletions conda/artiq/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
3 changes: 3 additions & 0 deletions conda/artiq/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

$PYTHON setup.py install --single-version-externally-managed --record=record.txt
47 changes: 47 additions & 0 deletions conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package:
name: artiq
version: "0.0"

source:
git_url: https://github.com/m-labs/artiq
git_tag: master

build:
number: 4
string: dev
entry_points:
- artiq_client = artiq.frontend.artiq_client:main
- artiq_ctlid = artiq.frontend.artiq_ctlid:main
- artiq_gui = artiq.frontend.artiq_gui:main
- artiq_master = artiq.frontend.artiq_master:main
- artiq_run = artiq.frontend.artiq_run:main
- lda_client = artiq.frontend.lda_client:main
- lda_controller = artiq.frontend.lda_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main

requirements:
build:
- python
- setuptools
- numpy
run:
- python
- llvmlite-or1k
- scipy
- numpy
- prettytable
- pyserial
- sphinx
- gbulb-artiq # [not win]
- cairoplot3-artiq # [not win]

test:
imports:
- artiq


about:
home: http://m-labs.hk/artiq
license: 3-clause BSD
summary: 'ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is being developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping.'
15 changes: 15 additions & 0 deletions conda/cairo/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
./configure \
--prefix=$PREFIX \
--disable-static \
--enable-warnings \
--enable-ft \
--enable-ps \
--enable-pdf \
--enable-svg \
--disable-gtk-doc
make
make install
rm -rf $PREFIX/share
# vim:set ts=8 sw=4 sts=4 tw=78 et:
25 changes: 25 additions & 0 deletions conda/cairo/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This conda recipe is based on this one: https://github.com/tpn/trent-conda-recipes/tree/master/cairo

package:
name: cairo
version: 1.14.0
source:
fn: cairo-1.14.0.tar.xz
url: http://cairographics.org/releases/cairo-1.14.0.tar.xz
build:
number: 0
requirements:
build:
- freetype
- libpng
- pixman >=0.30
- zlib
run:
- freetype
- libpng
- pixman >=0.30
- zlib
about:
home: http://cairographics.org/
license: LGPL 2.1 and MPL 1.1
# vim:set ts=8 sw=2 sts=2 tw=78 et:
29 changes: 29 additions & 0 deletions conda/cairoplot3-artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package:
name: cairoplot3-artiq
version: "3.1.2"

source:
git_url: https://github.com/m-labs/cairoplot3
git_tag: master

build:
number: 0
script: $PYTHON setup.py install

requirements:
build:
- python
- setuptools
run:
- python
- pycairo

test:
imports:
- cairoplot
- series

about:
home: https://github.com/m-labs/cairoplot3
license: LGPL
summary: 'Module to easily plot beautiful graphics using PyCairo'
28 changes: 28 additions & 0 deletions conda/gbulb-artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package:
name: gbulb-artiq
version: "0.1"

source:
git_url: https://github.com/m-labs/gbulb
git_tag: master

build:
number: 0
script: $PYTHON setup.py install

requirements:
build:
- python
- setuptools
run:
- python
- pygobject

test:
imports:
- gbulb

about:
home: https://github.com/m-labs/gbulb
license: Apache 2.0
summary: 'GLib event loop for tulip (PEP 3156)'
24 changes: 24 additions & 0 deletions conda/llvmdev-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
mkdir build
cd build
set BUILD_CONFIG=Release
REM Configure step
if "%ARCH%"=="32" (
set CMAKE_GENERATOR=Visual Studio 12 2013
) else (
set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
)
set CMAKE_GENERATOR_TOOLSET=v120_xp
@rem Reduce build times and package size by removing unused stuff
set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD=OR1K -DLLVM_INCLUDE_TESTS=OFF ^
-DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF ^
-DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF
cmake -G "%CMAKE_GENERATOR%" -T "%CMAKE_GENERATOR_TOOLSET%" ^
-DCMAKE_BUILD_TYPE="%BUILD_CONFIG%" -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
-DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% %CMAKE_CUSTOM% %SRC_DIR%
if errorlevel 1 exit 1
REM Build step
cmake --build . --config "%BUILD_CONFIG%"
if errorlevel 1 exit 1
REM Install step
cmake --build . --config "%BUILD_CONFIG%" --target install
if errorlevel 1 exit 1
25 changes: 25 additions & 0 deletions conda/llvmdev-or1k/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package:
name: llvmdev-or1k
version: "3.4"

source:
git_url: https://github.com/openrisc/llvm-or1k
git_tag: master

build:
number: 2

requirements:
build:
- system [linux and not armv6]
run:
- system [linux and not armv6]

#test:
#commands:
#- clang --help [linux and not armv6]

about:
home: http://llvm.org/
license: Open Source (http://llvm.org/releases/3.4/LICENSE.TXT)
summary: Development headers and libraries for LLVM
11 changes: 11 additions & 0 deletions conda/llvmlite-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@rem Let CMake know about the LLVM install path, for find_package()
set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%

@rem Ensure there are no build leftovers (CMake can complain)
if exist ffi\build rmdir /S /Q ffi\build

@rem Apply patches
patch -p1 < %RECIPE_DIR%/../../patches/llvmlite/0001-add-all-targets.patch

%PYTHON% -S setup.py install
if errorlevel 1 exit 1
4 changes: 4 additions & 0 deletions conda/llvmlite-or1k/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

patch -p1 < ${RECIPE_DIR}/../../patches/llvmlite/0001-add-all-targets.patch
PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
27 changes: 27 additions & 0 deletions conda/llvmlite-or1k/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package:
name: llvmlite-or1k
version: "0.2.1"

source:
git_url: https://github.com/numba/llvmlite
git_tag: 11a8303d02e3d6dd2d1e0e9065701795cd8a979f

requirements:
build:
- python
- llvmdev-or1k
- setuptools
run:
- python

build:
number: 0

test:
imports:
- llvmlite
- llvmlite.llvmpy

about:
home: https://pypi.python.org/pypi/llvmlite/
license: BSD
4 changes: 4 additions & 0 deletions conda/pixman/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
./configure --prefix=$PREFIX
make -j
make install
16 changes: 16 additions & 0 deletions conda/pixman/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This conda recipe comes from https://github.com/sandialabs/pixman-conda-recipe

package:
name: pixman
version: "0.32.6"

source:
fn: pixman-0.32.6.tar.gz
url: http://cairographics.org/releases/pixman-0.32.6.tar.gz

build:
number: 0

about:
home: http://cairographics.org
license: GNU Lesser General Public License (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at your option.
8 changes: 8 additions & 0 deletions conda/prettytable/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"%PYTHON%" setup.py install
if errorlevel 1 exit 1

:: Add more build steps here, if they are necessary.

:: See
:: http://docs.continuum.io/conda/build.html
:: for a list of environment variables that are set during the build process.
3 changes: 3 additions & 0 deletions conda/prettytable/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

$PYTHON setup.py install
26 changes: 26 additions & 0 deletions conda/prettytable/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package:
name: prettytable
version: !!str 0.7.2

source:
fn: prettytable-0.7.2.tar.bz2
url: https://pypi.python.org/packages/source/P/PrettyTable/prettytable-0.7.2.tar.bz2
md5: 760dc900590ac3c46736167e09fa463a

requirements:
build:
- python
- setuptools

run:
- python

test:
imports:
- prettytable


about:
home: http://code.google.com/p/prettytable/
license: BSD License
summary: 'A simple Python library for easily displaying tabular data in a visually appealing ASCII table format.'
1 change: 1 addition & 0 deletions conda/pycairo/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%PYTHON% setup.py install
3 changes: 3 additions & 0 deletions conda/pycairo/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

$PYTHON setup.py install
29 changes: 29 additions & 0 deletions conda/pycairo/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package:
name: pycairo
version: "1.10.0"

source:
git_url: git://git.cairographics.org/git/pycairo
git_tag: master

build:
number: 2
script: $PYTHON setup.py install

requirements:
build:
- python
- setuptools
- cairo 1.14.0 # [not win]
run:
- python
- cairo 1.14.0 # [not win]

test:
imports:
- cairo

about:
home: http://cairographics.org/pycairo/
license: LGPL 3
summary: 'Python 3 bindings for cairo'
6 changes: 6 additions & 0 deletions conda/pygobject/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
TERM=xterm ./autogen.sh
export CFLAGS="-L$PREFIX/lib -I$PREFIX/include"
./configure --prefix=$PREFIX
make
make install
Loading