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: aba749093b31
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: 291ca0bf8d22
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 7, 2015

  1. Copy the full SHA
    9420554 View commit details
  2. Copy the full SHA
    291ca0b View commit details
Showing with 22 additions and 15 deletions.
  1. +1 −0 conda/artiq/bld.bat
  2. +1 −1 conda/artiq/build.sh
  3. +3 −1 conda/artiq/meta.yaml
  4. +17 −13 setup.py
1 change: 1 addition & 0 deletions conda/artiq/bld.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
set ARTIQ_GUI=0
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
2 changes: 1 addition & 1 deletion conda/artiq/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

$PYTHON setup.py install --single-version-externally-managed --record=record.txt
ARTIQ_GUI=1 $PYTHON setup.py install --single-version-externally-managed --record=record.txt
4 changes: 3 additions & 1 deletion conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ build:
entry_points:
- artiq_client = artiq.frontend.artiq_client:main
- artiq_ctlid = artiq.frontend.artiq_ctlid:main
- artiq_gui = artiq.frontend.artiq_gui:main
- artiq_gui = artiq.frontend.artiq_gui:main # [not win]
- artiq_master = artiq.frontend.artiq_master:main
- artiq_run = artiq.frontend.artiq_run:main
- lda_client = artiq.frontend.lda_client:main
@@ -33,6 +33,8 @@ requirements:
- prettytable
- pyserial
- sphinx
- h5py
- dateutil
- gbulb-artiq # [not win]
- cairoplot3-artiq # [not win]

30 changes: 17 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,23 @@
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py"
]
if os.name != 'nt':
scripts = [
"artiq_client=artiq.frontend.artiq_client:main",
"artiq_ctlid=artiq.frontend.artiq_ctlid:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr: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",
]

if os.getenv("ARTIQ_GUI") == "1":
requirements += ["pygobject", "gbulb", "cairoplot"]
scripts += [
"artiq_gui=artiq.frontend.artiq_gui:main"
]


setup(
@@ -33,17 +48,6 @@
package_data={"artiq": [os.path.join("gui", "icon.png")]},
ext_modules=[],
entry_points={
"console_scripts": [
"artiq_client=artiq.frontend.artiq_client:main",
"artiq_ctlid=artiq.frontend.artiq_ctlid:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr: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",
],
"console_scripts": scripts,
}
)