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: b3b0e19d2180
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: 6500d3fc6316
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 19, 2016

  1. dashboard: larger experiment initial window size

    @sbourdeauducq
    sbourdeauducq committed Jun 19, 2016
    Copy the full SHA
    b769403 View commit details

  2. conda: use setuptools entry_points 

    Conda entry_points doesn't support gui_scripts
    @sbourdeauducq
    sbourdeauducq committed Jun 19, 2016
    Copy the full SHA
    6500d3f View commit details
Showing with 1 addition and 21 deletions.
  1. +1 −1 artiq/dashboard/experiments.py
  2. +0 −20 conda/artiq/meta.yaml
2 changes: 1 addition & 1 deletion artiq/dashboard/experiments.py
View file
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
def __init__(self, manager, expurl):
QtWidgets.QMdiSubWindow.__init__(self)
qfm = QtGui.QFontMetrics(self.font())
self.resize(90*qfm.averageCharWidth(), 30*qfm.lineSpacing())
self.resize(100*qfm.averageCharWidth(), 30*qfm.lineSpacing())
self.setWindowTitle(expurl)
self.setWindowIcon(QtWidgets.QApplication.style().standardIcon(
QtWidgets.QStyle.SP_FileDialogContentsView))
20 changes: 0 additions & 20 deletions conda/artiq/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,26 +9,6 @@ build:
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
entry_points:
- artiq_browser = artiq.frontend.artiq_browser:main
- artiq_client = artiq.frontend.artiq_client:main
- artiq_compile = artiq.frontend.artiq_compile:main
- artiq_coreanalyzer = artiq.frontend.artiq_coreanalyzer:main
- artiq_coreconfig = artiq.frontend.artiq_coreconfig:main
- artiq_corelog = artiq.frontend.artiq_corelog:main
- artiq_ctlmgr = artiq.frontend.artiq_ctlmgr:main
- artiq_dashboard = artiq.frontend.artiq_dashboard:main
- artiq_influxdb = artiq.frontend.artiq_influxdb:main
- artiq_master = artiq.frontend.artiq_master:main
- artiq_mkfs = artiq.frontend.artiq_mkfs:main
- artiq_rpctool = artiq.frontend.artiq_rpctool:main
- artiq_run = artiq.frontend.artiq_run:main
- artiq_flash = artiq.frontend.artiq_flash:main
- lda_controller = artiq.frontend.lda_controller:main
- novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main

requirements:
build: