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: 5460d24dc5a6^
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: 4612eb496143
Choose a head ref
  • 6 commits
  • 36 files changed
  • 1 contributor

Commits on Jan 25, 2016

  1. manual: __version__ cleanup

    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    5460d24 View commit details

  2. artiq: move namespace artiq.* -> artiq.language.* 

      perl -i -pe 's/^from artiq import \*$/from artiq.language import */' your_experiments/*.py
    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    c1c831c View commit details

  3. artiq.experiment: merge language and coredevice namespaces 

       perl -i -pe 's/^from artiq import \*$/from artiq.experiment import */' your_experiments/*.py

(assuming you skipped the changes form the previous commit)
    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    e41b747 View commit details

  4. artiq.experiment: update examples

    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    e2bf833 View commit details

  5. language...ARTIQException -> coredevice...CoreException 

    gets rid of a cross import
is only used there
    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    6920828 View commit details

  6. coredevice: remove some print()s

    @jordens
    jordens committed Jan 25, 2016
    Copy the full SHA
    4612eb4 View commit details
Loading